before merge II