Delete merge conflict code