Cleaned up merged files

Hopefully the website works now...