change 2
change 3
Merge branch 'MergeTest'

Conflicts:
	Test file 1.txt