3rd commit
new file in testing branch
2nd commit in testing branch
4th commit in master branch
Merge branch 'testing'

Conflicts:
	test.txt