not hi
Merge branch 'newbranch'

Conflicts:
	test.txt
added auto
Merge branch 'newbranch'