made a change after branching
add fix
add a test
Merge branch 'testing'
add line
add some stuff
Merge branch 'b2'

Conflicts:
	newFile