Update test.txt
Merge remote-tracking branch 'origin/develop' into develop
testing merge conflict
testing merge
Merge branch 'develop'

Conflicts:
	test.txt