br del com 2
Merge branch 'another'

Conflicts:
	test3_another_file.txt