add a new line
Merge branch 'new_branch'
conflict 1
conflict 2
Merge branch 'new_branch'

Conflicts:
	README.md