retain commit from merge