Revert "Resolve conflicts"

This reverts commit 0dee3f6dafc47d767deb15b10055bd3d1035455b, reversing
changes made to 4b9dfd11c2fc430f3070237129685bd3e234f811.

Conflicts:
	README.md