fix merge line