change1
commit again
commit again again
commit to test branch
commit to master
merge master from test branch

Conflicts:
	ConflictFile.txt