before merge
after merege