git合并的时候，冲突问题Merging is not possible because you have unmerged files