Pull is not possible because you have unmerged files 的解决方法