branch a test
branch b
Merge branch 'branchA' into branchB

Conflicts:
	test.txt
sdss
sdsdas
ffassfa
Merge branch 'branchA'

Conflicts:
	test.txt
asdsad

 Please enter the commit message for your changes. Lines starting
dasadssa
wwwww
Merge branch 'branchA'

Conflicts:
	test.txt
sddsa
sdffa