Removing leftover merge conflict

So there was a merge conflict still in the code of this release, in the footer of the site. Kinda funky looking. This removes it.