Commit for merge
Commit after merge