First commit in the 2nd Branch
zdbfdf
zfbdf
Merge branch 'new_branch'

Conflicts:
	2.txt