merge continued