clean up
fix merge