clean up
fix merge conflicts