fix up merge