MAJOR FIX

I have made the page work again after some conflict errors that changed
the file and stopped it working