fix merge order