cleaning up bad merge