merge conflict cleanup