comit1
Merge branch 'new_branch'

Conflicts:
	a.txt