Adding a line that should have a conflict.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md