cleanup of files from the mergerebasething