It is possible that your changes caused a conflict with the original item, and the changes will exist in the Conflicts folder.

• 所做的更改可能引起了与原项目的冲突,这些更改将存在于“冲突”文件夹中。