Merge conflicts devour changes.