fix1
fix2
Merge branch 'test'

Conflicts:
	test.txt
fix