Update README.md
fix conflict

Conflicts:
	README.md