fix bad conflict/replace generation