Recommit after shitty merge