add hello to b.txt
add what to b.txt
add how to file
merge file
br1
br2
Merge branch 'hel'

Conflicts:
	b.txt