Remove merge conflict flag