Fixing up merge