commit before merge
commit after merge