Conflict 1
Conflict 2
Merge branch 'feature-test'

Conflicts:
	test.txt