fixing up bad merge