Reapplying edits lost with merge