Undo a merge error in previous pull request