clean up
fixed merge