add merge_test.txt
modify merge_test.txt
modify merge_test.txt
Merge branch 'b_branch'

Conflicts:
	merge_test.txt