jij
iji
jf
add c.txt and blow it off
conflict in b.txt
b master
Merge branch 'b1'

Conflicts:
	b.txt