Remove merge conflict