fix merge file