Fixing merge conflict for PR #1244

This is step 1 because Git didn't like me deleting the HTML files for some reason.