Create MyTestFile3
Update MyTestFile1
Update MyTestFile1
Merge branch 'master' into feature1

Conflicts:
	MyTestFile3