test merge
Merge remote branch 'choose_remote_name/master'

Conflicts:
	test.txt