error: Merging is not possible because you have unmerged files.hint: Fix them up in the work tree, and then use 'git add/rm 'hint: as appropriate to m