before merge
merged version