Fix merge conflicts
Add route to contact page, pass all tests