fix a couple of merge confusion