made a change
made other changes
Merge branch 'testing'

Conflicts:
	a file.txt