merge cleaned, running