Added contact page
Added contact page and resolved conflicts