Reapply the lost merge :-(