Initial commit
first commit
first time to commit
Merge branch 'source'
commit after conflict
second time