Commit before merge
Commit after  merge