br 1 commit
br 1 commit 2
master commit 1
master commit 4
br new commit
Merge branch 'br1'

Conflicts:
	newfile1.txt
commit head local
test sdfsd fwe
Merge branch 'HEADlocal'

Conflicts:
	README.md
commit smartgit