error: Pulling is not possible because you have unmerged files