Reinstated text lost during reconciling merge conflicts