Fixing mergetool artifacts.