406 error wasnt loading the html!
Fixing merge conflict yet again