local change
changed in branch
changed in master
Merge branch 'testing'

Conflicts:
	dummyfile1