fix merge result