Added Contact Page
Fixed Conflicts