Removing code from a merge conflict