Set up merge point from gingerbread