before merge with original