re-inserted updates post-merge conflict