clean up and fix merge