confrict test
Merge branch 'feature-2'

Conflicts:
	test.txt