fix a non-conflict merge bug
full round-trip test for multiple replacement