diff --git a/aio/content/marketing/index.html b/aio/content/marketing/index.html
index 7af482142c..e0bb9e3f9d 100755
--- a/aio/content/marketing/index.html
+++ b/aio/content/marketing/index.html
@@ -66,12 +66,6 @@
         <div><img src="assets/images/home/loved-by-millions.png"></div>
       </div>
     </div>
-<<<<<<< HEAD
-    <div class="cta-bar"><a href="guide/quickstart" md-button="md-button"
-                            class="button button-large button-shield mat-raised mat-primary">Get
-      Started</a></div>
-=======
     <div class="cta-bar"><a href="/guide/quickstart" md-button="md-button" class="button button-large button-shield mat-raised mat-primary">Get Started</a></div>
->>>>>>> feat(aio): about page styles
   </div>
 </article>
diff --git a/aio/src/app/embedded/contributor/contributor.service.spec.ts b/aio/src/app/embedded/contributor/contributor.service.spec.ts
index 9a7b7fdeee..08eb939931 100644
--- a/aio/src/app/embedded/contributor/contributor.service.spec.ts
+++ b/aio/src/app/embedded/contributor/contributor.service.spec.ts
@@ -94,7 +94,7 @@ function getTestContribs() {
       "name": "Igor Minar",
       "picture": "igor-minar.jpg",
       "twitter": "IgorMinar",
-      "website": "https://Angular.com/+IgorMinar",
+      "website": "https://google.com/+IgorMinar",
       "bio": "Igor is a software engineer at Angular.",
       "group": "Angular"
     },
@@ -118,7 +118,7 @@ function getTestContribs() {
       "name": "Naomi Black",
       "picture": "naomi.jpg",
       "twitter": "naomitraveller",
-      "website": "http://Angular.com/+NaomiBlack",
+      "website": "http://google.com/+NaomiBlack",
       "bio": "Naomi is Angular's TPM generalist and jack-of-all-trades.",
       "group": "Angular"
     }
diff --git a/aio/src/styles/2-modules/_contributor.scss b/aio/src/styles/2-modules/_contributor.scss
index c17fbe4866..a84ac2c506 100644
--- a/aio/src/styles/2-modules/_contributor.scss
+++ b/aio/src/styles/2-modules/_contributor.scss
@@ -94,6 +94,7 @@ aio-contributor {
         text-align: center;
         display: flex;
         flex-direction: column;
+        box-sizing: border-box;
       }
 
       .card-front {
@@ -101,8 +102,26 @@ aio-contributor {
       }
 
       .card-back {
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
         padding: 16px;
         transform:rotateY(180deg);
+
+        h3 {
+          overflow: auto;
+          padding: 8px;
+          margin: 0;
+        }
+
+        p {
+          margin: 8px 0;
+          font-size: 12px;
+          line-height: 14px;
+          text-align: left;
+        }
+
       }
 
       &.flipped {