fixing things
fix merge