insert one line in test2.md
insert one line in test2.md on master branch
insert another in test2.md on testing ranch
insert one line on master branch
Merge branch 'testing'

Conflicts:
	test2.md