sub ni commit
Merge branch 'sub'

Conflicts:
	test.txt
no message
Merge branch 'master' into other_member

Conflicts:
	test.txt