Merge conflict residue