a
b
1a
add a to the end
Merge branch 'debug'

Conflicts:
	b.txt