fix merge right