updated testfile_ver1 in mid-11 for merge conflict test
Merge branch 'mid-11' into sprint-000

Conflicts:
	testfile_ver1