Fix merge conflict code