finished fixing up merge