https://guid.cam/zh-TW/tech/shasta/you-have-two-copies-of-file-couldnt-merge-changes/