before merge
merged and cleaned