fix bad conflict/replace generation
Merge pull request #340 from vrabaud/master

fix bad conflict/replace generation