除了答案在相关问题中显示，也可以解决冲突，删除自动生成的文件，并将标记为合并。

Aside from the answers shown in the related question, it is also possible to solve the conflict, delete the automatically generated files and Mark as Merged.