fixing up merge