fix merge cleaning