add j
add k
Merge branch 'b0'

Conflicts:
	sample.txt