fist commit to new branch
second commit in new branch
fixed conflict
Merge branch 'new_branch'

Conflicts:
	test_doc.txt.txt