add line 2
Merge branch 'work_branch'

Conflicts:
	test_file.txt