fixing things
fix conflict