Git Merge FailedMerging is not possible because you have unmerged files.hint: Fix them up in the w

NoSuchKey