cleanup after merge conflict