redoing a lost a commit from a past merge confict