recommit after merge