file2 changed in testing branch
Merge branch 'testing'

Conflicts:
	dir2/file2.txt

Resolved conflict with file2.txt
changing d1