Commit before merging
Commit after merging