Revert "fixes merge conflict"

This reverts commit 61c2050287a4f772cdd7a7342bd9a92c75407c92, reversing
changes made to 721a536c07314d5d819b66a930233fcab62904b0.

Conflicts:
	index.html