Removing a merge conflict backup  file...