smile commit
Conflict commit
conflict commit on master
Merge branch 'testbranch'

Conflicts:
	README.md
new conflict test
commit test on master
kdiff3 merge test
Merge branch 'branch_A'