cleanup merge conflict residue
merge