native conflict 1
native conflict in branch test/0.0.2...
Merge branch 'test/0.0.2'

Conflicts:
	test.txt