Remove merge conflict comment