Removing merge conflict markers :(