clean fix merge