commiting test at branchB
commit
branchB commit
message
Merge branch 'branchB'

Conflicts:
	new2.txt
commiting the master changes