Can't commit changes due to unresolved conflicts

Can’t commit changes due to unresolved conflicts

点击此处查看冲突 然后合并冲突即可。