Added line 6.
Merge branch 'foo' into bar

Conflicts:
	README.md