cleanin house
fix merge conflicts