test conflict 1
test conflict 2
Merge branch 'testing2'

Conflicts:
	sarah.txt