pre clean up working commit