before merge
After merged changes