clean up bad merge