ACTUALLY save the resolution of the merge conflict