diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug
index 9264b36a..f27809f9 100644
--- a/app/views/form.server.view.pug
+++ b/app/views/form.server.view.pug
@@ -37,6 +37,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
         background: url('/static/dist/page-loader.gif') 50% 35% no-repeat rgb(249,249,249);
         background-size: 50px 50px;
       }
+<<<<<<< HEAD
       body {
         font-family: 'Raleway' !important;
       }
@@ -71,6 +72,8 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
         background-color: #755 !important;
       }
 
+=======
+>>>>>>> parent of 45f8fe7a... fix form styling
     // Fav Icon 
     link(href='/static/modules/core/img/brand/favicon.ico', rel='shortcut icon', type='image/x-icon')
 
diff --git a/app/views/verification.email.view.pug b/app/views/verification.email.view.pug
index 2810481d..fb225507 100644
--- a/app/views/verification.email.view.pug
+++ b/app/views/verification.email.view.pug
@@ -30,7 +30,7 @@ html
                               p
                                 a(href='http://${URL}')=__('VERIFICATION_EMAIL_LINK_TEXT')
                               p=__('VERIFICATION_EMAIL_PARAGRAPH_2')
-                                a(href='mailto:hello@earlybird.camp') 
+                                a(href='mailto:team@tellform.com') 
                                   | team@tellform.com
                               p=__('EMAIL_SIGNATURE')
                             td(width='36')