Fixing some merge confusion