testing-modified testing.txt
testing -- modified testing.txt
master branch -- modified testing.txt
Merge branch 'testing'

Conflicts:
	testing.txt