fix merge files