before merge zjc