Any conflicts are resolved automatically.

• 自动解决所有冲突。