try crazy copy/paste
merge conflict