Merging branch
Commit after merge conflict