Still testing...
Hey!
This is the commit of q new branch
This is branch1 commit
Commit for branch2
Guess what: This is the commit for branch3
Merge branch 'branch2'

Conflicts:
	newfile.txt
Merge branch 'branch3'

Conflicts:
	newfile.txt