fix merge flags