fix merge confusion