diff --git a/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap b/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
index b67368e85..63158c983 100644
--- a/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
+++ b/src/core/client/stream/components/__snapshots__/App.spec.tsx.snap
@@ -13,11 +13,6 @@ exports[`renders comments 1`] = `
     >
       Comments
     </withPropsOnChange(Tab)>
-    <withPropsOnChange(Tab)
-      tabId="PROFILE"
-    >
-      My Profile
-    </withPropsOnChange(Tab)>
   </withPropsOnChange(TabBar)>
   <TabContent
     activeTab="COMMENTS"
diff --git a/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
index f6e5286bd..a7cd8aaa8 100644
--- a/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/editComment.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`cancel edit: edit canceled 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,136 +30,22 @@ exports[`cancel edit: edit canceled 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
       className="HorizontalGutter-root Stream-root HorizontalGutter-double"
     >
       <div
-<<<<<<< HEAD
         className="HorizontalGutter-root HorizontalGutter-half"
-=======
-        className="HorizontalGutter-root HorizontalGutter-full"
-      >
-        <div
-          className="Indent-root"
-        >
-          <div
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-                <div>
-                  <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                    onTouchEnd={[Function]}
-                    type="button"
-                  >
-                    Edit
-                  </button>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        className="HorizontalGutter-root HorizontalGutter-full"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
       >
         <div
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -193,67 +78,6 @@ exports[`cancel edit: edit canceled 1`] = `
               >
                 Sign Out
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </div>
@@ -396,48 +220,70 @@ exports[`cancel edit: edit canceled 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
+                  </div>
+                  <div>
+                    <button
+                      className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                      id="comments-commentContainer-editButton-comment-0"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseDown={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      Edit
+                    </button>
                   </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -447,62 +293,12 @@ exports[`cancel edit: edit canceled 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
-=======
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "Joining Too",
-=======
-                    "__html": "What's up?",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-0"
-=======
-                  id="comments-commentContainer-replyButton-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
           </div>
         </div>
@@ -513,60 +309,65 @@ exports[`cancel edit: edit canceled 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -586,15 +387,14 @@ exports[`edit a comment: edit form 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -608,33 +408,10 @@ exports[`edit a comment: edit form 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -820,7 +597,6 @@ exports[`edit a comment: edit form 1`] = `
         <div
           className="HorizontalGutter-root HorizontalGutter-full"
         >
-<<<<<<< HEAD
           <form
             autoComplete="off"
             id="comments-editCommentForm-form-comment-0"
@@ -830,25 +606,11 @@ exports[`edit a comment: edit form 1`] = `
               className="HorizontalGutter-root HorizontalGutter-full"
             >
               <div>
-=======
-          <div
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
                 <div
                   className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                 >
                   <span
                     className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
                   >
                     Markus
                   </span>
@@ -1004,79 +766,65 @@ exports[`edit a comment: edit form 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-=======
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-<<<<<<< HEAD
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -1096,15 +844,14 @@ exports[`edit a comment: optimistic response 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -1118,33 +865,10 @@ exports[`edit a comment: optimistic response 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -1499,63 +1223,65 @@ exports[`edit a comment: optimistic response 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-=======
-              >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -1575,15 +1301,14 @@ exports[`edit a comment: render stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -1597,33 +1322,10 @@ exports[`edit a comment: render stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -1813,36 +1515,67 @@ exports[`edit a comment: render stream 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
+                  </div>
+                  <div>
+                    <button
+                      className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                      id="comments-commentContainer-editButton-comment-0"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseDown={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      Edit
+                    </button>
                   </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -1852,38 +1585,12 @@ exports[`edit a comment: render stream 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
           </div>
         </div>
@@ -1891,59 +1598,54 @@ exports[`edit a comment: render stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-<<<<<<< HEAD
-                    Lukas
-=======
-                    Markus
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-<<<<<<< HEAD
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-=======
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -1953,49 +1655,13 @@ exports[`edit a comment: render stream 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "What's up?",
-=======
-                    "__html": "Joining Too",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-1"
-=======
-                  id="comments-commentContainer-replyButton-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
-<<<<<<< HEAD
           </div>
         </div>
       </div>
@@ -2013,15 +1679,14 @@ exports[`edit a comment: server response 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -2035,33 +1700,10 @@ exports[`edit a comment: server response 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -2107,8 +1749,6 @@ exports[`edit a comment: server response 1`] = `
                 Sign Out
               </button>
             </div>
-=======
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           </div>
         </div>
         <form
@@ -2118,7 +1758,6 @@ exports[`edit a comment: server response 1`] = `
           onSubmit={[Function]}
         >
           <div
-<<<<<<< HEAD
             className="HorizontalGutter-root HorizontalGutter-full"
           >
             <div>
@@ -2237,67 +1876,6 @@ exports[`edit a comment: server response 1`] = `
               >
                 Submit
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </form>
@@ -2315,45 +1893,76 @@ exports[`edit a comment: server response 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
                     <div
-                      className="EditedMarker-root"
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      (
-                      <span>
-                        Edited
-                      </span>
-                      )
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                      <div
+                        className="EditedMarker-root"
+                      >
+                        (
+                        <span>
+                          Edited
+                        </span>
+                        )
+                      </div>
                     </div>
                   </div>
+                  <div>
+                    <button
+                      className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                      id="comments-commentContainer-editButton-comment-0"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseDown={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      Edit
+                    </button>
+                  </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Edited! (from server)",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -2363,38 +1972,12 @@ exports[`edit a comment: server response 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Edited! (from server)",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
           </div>
         </div>
@@ -2402,68 +1985,54 @@ exports[`edit a comment: server response 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-<<<<<<< HEAD
-                    Lukas
-=======
-                    Markus
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-<<<<<<< HEAD
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-=======
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Lukas
+                    </span>
                     <div
-                      className="EditedMarker-root"
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      (
-                      <span>
-                        Edited
-                      </span>
-                      )
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
                     </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
                   </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -2473,46 +2042,12 @@ exports[`edit a comment: server response 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "What's up?",
-=======
-                    "__html": "Edited! (from server)",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-1"
-=======
-                  id="comments-commentContainer-replyButton-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
           </div>
         </div>
@@ -2531,15 +2066,14 @@ exports[`shows expiry message: edit form closed 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -2553,33 +2087,10 @@ exports[`shows expiry message: edit form closed 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -2592,7 +2103,6 @@ exports[`shows expiry message: edit form closed 1`] = `
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -2625,67 +2135,6 @@ exports[`shows expiry message: edit form closed 1`] = `
               >
                 Sign Out
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </div>
@@ -2828,48 +2277,70 @@ exports[`shows expiry message: edit form closed 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
+                  </div>
+                  <div>
+                    <button
+                      className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                      id="comments-commentContainer-editButton-comment-0"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseDown={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      Edit
+                    </button>
                   </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -2879,68 +2350,12 @@ exports[`shows expiry message: edit form closed 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-=======
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-                <div>
-                  <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-comment-0"
-                    onBlur={[Function]}
-                    onClick={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onMouseOut={[Function]}
-                    onMouseOver={[Function]}
-                    onTouchEnd={[Function]}
-                    type="button"
-                  >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
           </div>
         </div>
@@ -2948,80 +2363,68 @@ exports[`shows expiry message: edit form closed 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-=======
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -3041,15 +2444,14 @@ exports[`shows expiry message: edit time expired 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -3063,33 +2465,10 @@ exports[`shows expiry message: edit time expired 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -3275,7 +2654,6 @@ exports[`shows expiry message: edit time expired 1`] = `
         <div
           className="HorizontalGutter-root HorizontalGutter-full"
         >
-<<<<<<< HEAD
           <form
             autoComplete="off"
             id="comments-editCommentForm-form-comment-0"
@@ -3285,25 +2663,11 @@ exports[`shows expiry message: edit time expired 1`] = `
               className="HorizontalGutter-root HorizontalGutter-full"
             >
               <div>
-=======
-          <div
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
                 <div
                   className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                 >
                   <span
                     className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
                   >
                     Markus
                   </span>
@@ -3436,89 +2800,65 @@ exports[`shows expiry message: edit time expired 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-=======
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
index 03718ff89..dbfdc3b88 100644
--- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
@@ -369,15 +369,14 @@ exports[`renders comment stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -391,33 +390,10 @@ exports[`renders comment stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -551,25 +527,9 @@ exports[`renders comment stream 1`] = `
             onTouchEnd={[Function]}
             type="submit"
           >
-            Sign in and join the conversation
+            Sign in and Join the Conversation
           </button>
         </div>
-<<<<<<< HEAD
-=======
-        <button
-          className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth Button-disabled"
-          disabled={true}
-          onBlur={[Function]}
-          onFocus={[Function]}
-          onMouseDown={[Function]}
-          onMouseOut={[Function]}
-          onMouseOver={[Function]}
-          onTouchEnd={[Function]}
-          type="submit"
-        >
-          Sign in and Join the Conversation
-        </button>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
       </div>
       <div
         aria-live="polite"
@@ -581,80 +541,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-=======
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -663,71 +611,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -746,28 +691,9 @@ exports[`renders comment stream 1`] = `
           onTouchEnd={[Function]}
           type="button"
         >
-          Load more
+          Load More
         </button>
       </div>
-<<<<<<< HEAD
-=======
-      <button
-        aria-controls="talk-comments-stream-log"
-        className="BaseButton-root Button-root Button-sizeRegular Button-colorRegular Button-variantOutlined Button-fullWidth"
-        disabled={false}
-        id="talk-comments-stream-loadMore"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        type="button"
-      >
-        Load More
-      </button>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
     </div>
   </section>
 </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
index 1c3bd6a8a..4775e215c 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`renders permalink view 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,40 +30,12 @@ exports[`renders permalink view 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-<<<<<<< HEAD
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
-=======
-      Show All Comments
-    </a>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
     <div
       className="PermalinkView-root"
     >
@@ -82,83 +53,71 @@ exports[`renders permalink view 1`] = `
         target="_parent"
         type="button"
       >
-        Show all comments
+        Show All Comments
       </a>
       <div
-<<<<<<< HEAD
         className="Indent-root"
-=======
-        className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
       >
         <div
-          className="Comment-root"
-          role="article"
+          className=""
         >
           <div
-            className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-            id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+            className="Comment-root"
+            role="article"
           >
             <div
-              className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+              className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+              id="comment-comment-0"
             >
-              <span
-                className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-              >
-                Markus
-              </span>
               <div
-                className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
               >
-=======
-              >
-                Markus
-              </span>
-              <div
-                className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-              >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                <time
-                  className="Timestamp-root RelativeTime-root"
-                  dateTime="2018-07-06T18:24:00.000Z"
-                  title="2018-07-06T18:24:00.000Z"
+                <span
+                  className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                 >
-                  2018-07-06T18:24:00.000Z
-                </time>
+                  Markus
+                </span>
+                <div
+                  className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                >
+                  <time
+                    className="Timestamp-root RelativeTime-root"
+                    dateTime="2018-07-06T18:24:00.000Z"
+                    title="2018-07-06T18:24:00.000Z"
+                  >
+                    2018-07-06T18:24:00.000Z
+                  </time>
+                </div>
               </div>
             </div>
-          </div>
-          <div
-            className="HTMLContent-root"
-            dangerouslySetInnerHTML={
-              Object {
-                "__html": "Joining Too",
+            <div
+              className="HTMLContent-root"
+              dangerouslySetInnerHTML={
+                Object {
+                  "__html": "Joining Too",
+                }
               }
-            }
-          />
-          <div
-            className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-          >
-            <button
-              className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-              id="comments-commentContainer-replyButton-comment-0"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              onMouseDown={[Function]}
-              onMouseOut={[Function]}
-              onMouseOver={[Function]}
-              onTouchEnd={[Function]}
-              type="button"
+            />
+            <div
+              className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
             >
-              <span>
-                Reply
-              </span>
-            </button>
+              <button
+                className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                id="comments-commentContainer-replyButton-comment-0"
+                onBlur={[Function]}
+                onClick={[Function]}
+                onFocus={[Function]}
+                onMouseDown={[Function]}
+                onMouseOut={[Function]}
+                onMouseOver={[Function]}
+                onTouchEnd={[Function]}
+                type="button"
+              >
+                <span>
+                  Reply
+                </span>
+              </button>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
index e78487bcd..9f902fafd 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`renders permalink view with unknown asset 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,33 +30,10 @@ exports[`renders permalink view with unknown asset 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
index 3c0648b22..aec3aad12 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
@@ -9,16 +9,14 @@ exports[`renders permalink view with unknown comment 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
-<<<<<<< HEAD
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -32,39 +30,10 @@ exports[`renders permalink view with unknown comment 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-=======
-      Show All Comments
-    </a>
-    <p
-      className="Typography-root Typography-bodyCopy Typography-colorTextPrimary"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -84,7 +53,7 @@ exports[`renders permalink view with unknown comment 1`] = `
         target="_parent"
         type="button"
       >
-        Show all comments
+        Show All Comments
       </a>
       <p
         className="Typography-root Typography-bodyCopy Typography-colorTextPrimary"
diff --git a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
index 424e3199a..171e6aa3b 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postComment.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`post a comment: optimistic response 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,33 +30,10 @@ exports[`post a comment: optimistic response 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -241,36 +217,67 @@ exports[`post a comment: optimistic response 1`] = `
             className="IndentedComment-blur Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-uuid-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
+                  </div>
+                  <div>
+                    <button
+                      className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                      id="comments-commentContainer-editButton-uuid-0"
+                      onBlur={[Function]}
+                      onClick={[Function]}
+                      onFocus={[Function]}
+                      onMouseDown={[Function]}
+                      onMouseOut={[Function]}
+                      onMouseOver={[Function]}
+                      onTouchEnd={[Function]}
+                      type="button"
+                    >
+                      Edit
+                    </button>
                   </div>
                 </div>
-                <div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "<strong>Hello world!</strong>",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-uuid-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-uuid-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -280,38 +287,12 @@ exports[`post a comment: optimistic response 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
                 </div>
               </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "<strong>Hello world!</strong>",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-uuid-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
             </div>
           </div>
         </div>
@@ -322,125 +303,51 @@ exports[`post a comment: optimistic response 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          className="HorizontalGutter-root HorizontalGutter-full"
-        >
-          <div
-<<<<<<< HEAD
-            className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-uuid-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-              >
+                />
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-=======
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-                <div>
                   <button
-                    className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                    id="comments-commentContainer-editButton-uuid-0"
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -450,46 +357,81 @@ exports[`post a comment: optimistic response 1`] = `
                     onTouchEnd={[Function]}
                     type="button"
                   >
-                    Edit
+                    <span>
+                      Reply
+                    </span>
                   </button>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
                 </div>
               </div>
+            </div>
+          </div>
+        </div>
+        <div
+          className="HorizontalGutter-root HorizontalGutter-full"
+        >
+          <div
+            className="Indent-root"
+          >
+            <div
+              className=""
+            >
               <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "What's up?",
-=======
-                    "__html": "<strong>Hello world!</strong>",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-1"
-=======
-                  id="comments-commentContainer-replyButton-uuid-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                <div
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <div
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  >
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                    >
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
+                  </div>
+                </div>
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
+                  }
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                >
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -509,15 +451,14 @@ exports[`post a comment: server response 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -531,33 +472,10 @@ exports[`post a comment: server response 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -570,7 +488,6 @@ exports[`post a comment: server response 1`] = `
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -603,67 +520,6 @@ exports[`post a comment: server response 1`] = `
               >
                 Sign Out
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </div>
@@ -674,7 +530,6 @@ exports[`post a comment: server response 1`] = `
           onSubmit={[Function]}
         >
           <div
-<<<<<<< HEAD
             className="HorizontalGutter-root HorizontalGutter-full"
           >
             <div>
@@ -793,67 +648,6 @@ exports[`post a comment: server response 1`] = `
               >
                 Submit
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </form>
@@ -871,60 +665,65 @@ exports[`post a comment: server response 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-x"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "<strong>Hello world! (from server)</strong>",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "<strong>Hello world! (from server)</strong>",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-x"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-x"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -933,79 +732,68 @@ exports[`post a comment: server response 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-x"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "Joining Too",
-=======
-                    "__html": "<strong>Hello world! (from server)</strong>",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-0"
-=======
-                  id="comments-commentContainer-replyButton-comment-x"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -1014,94 +802,68 @@ exports[`post a comment: server response 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-=======
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      2018-07-06T18:24:00.000Z
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    </time>
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "What's up?",
-=======
-                    "__html": "Joining Too",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-1"
-=======
-                  id="comments-commentContainer-replyButton-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -1121,15 +883,14 @@ exports[`renders comment stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -1143,33 +904,10 @@ exports[`renders comment stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -1182,7 +920,6 @@ exports[`renders comment stream 1`] = `
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -1215,67 +952,6 @@ exports[`renders comment stream 1`] = `
               >
                 Sign Out
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </div>
@@ -1418,80 +1094,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-=======
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -1500,71 +1164,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
index 962b4ec4b..8f2fc4fa6 100644
--- a/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/postReply.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`post a reply: open reply form 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,33 +30,10 @@ exports[`post a reply: open reply form 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -70,7 +46,6 @@ exports[`post a reply: open reply form 1`] = `
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -103,67 +78,6 @@ exports[`post a reply: open reply form 1`] = `
               >
                 Sign Out
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost Button-active"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </div>
@@ -306,91 +220,68 @@ exports[`post a reply: open reply form 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-<<<<<<< HEAD
-                    Markus
-=======
-                    Lukas
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-<<<<<<< HEAD
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-=======
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      2018-07-06T18:20:00.000Z
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    </time>
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "Joining Too",
-=======
-                    "__html": "What's up?",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-<<<<<<< HEAD
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost Button-active"
-                  id="comments-commentContainer-replyButton-comment-0"
-=======
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost Button-active"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -529,60 +420,65 @@ exports[`post a reply: open reply form 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -602,15 +498,14 @@ exports[`post a reply: optimistic response 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -624,33 +519,10 @@ exports[`post a reply: optimistic response 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -663,7 +535,6 @@ exports[`post a reply: optimistic response 1`] = `
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -696,67 +567,6 @@ exports[`post a reply: optimistic response 1`] = `
               >
                 Sign Out
               </button>
-=======
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost Button-active"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
             </div>
           </div>
         </div>
@@ -899,175 +709,71 @@ exports[`post a reply: optimistic response 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className="HorizontalGutter-root HorizontalGutter-full"
           >
             <div
-              className="IndentedComment-blur Indent-root"
+              className=""
             >
               <div
-                className="Indent-level1"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Comment-root"
-                  role="article"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
                   <div
-                    className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                    id="comment-uuid-0"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                    >
+                      Markus
+                    </span>
                     <div
-                      className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      <span
-                        className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
                       >
-                        Markus
-                      </span>
-                      <div
-                        className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                      >
-                        <time
-                          className="Timestamp-root RelativeTime-root"
-                          dateTime="2018-07-06T18:24:00.000Z"
-                          title="2018-07-06T18:24:00.000Z"
-                        >
-                          2018-07-06T18:24:00.000Z
-                        </time>
-                      </div>
+                        2018-07-06T18:24:00.000Z
+                      </time>
                     </div>
-                    <div>
-                      <button
-                        className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                        id="comments-commentContainer-editButton-uuid-0"
-                        onBlur={[Function]}
-                        onClick={[Function]}
-                        onFocus={[Function]}
-                        onMouseDown={[Function]}
-                        onMouseOut={[Function]}
-                        onMouseOver={[Function]}
-                        onTouchEnd={[Function]}
-                        type="button"
-                      >
-                        Edit
-                      </button>
-                    </div>
-                  </div>
-                  <div
-                    className="HTMLContent-root"
-                    dangerouslySetInnerHTML={
-                      Object {
-                        "__html": "<strong>Hello world!</strong>",
-                      }
-                    }
-                  />
-                  <div
-                    className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-                  >
-                    <button
-                      className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                      id="comments-commentContainer-replyButton-uuid-0"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
-                    >
-                      <span>
-                        Reply
-                      </span>
-                    </button>
                   </div>
                 </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        className="HorizontalGutter-root HorizontalGutter-full"
-      >
-        <div
-          className="Indent-root"
-        >
-          <div
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-<<<<<<< HEAD
-                    "__html": "Joining Too",
-=======
-                    "__html": "What's up?",
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-<<<<<<< HEAD
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost Button-active"
-                  id="comments-commentContainer-replyButton-comment-0"
-=======
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost Button-active"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
-<<<<<<< HEAD
           <form
             autoComplete="off"
             id="comments-replyCommentForm-form-comment-0"
@@ -1189,49 +895,107 @@ exports[`post a reply: optimistic response 1`] = `
               </div>
             </div>
           </form>
-=======
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`post a reply: server response 1`] = `
-<div
-  className="Flex-root App-root Flex-flex Flex-justifyCenter"
->
-  <div
-    className="HorizontalGutter-root Stream-root HorizontalGutter-double"
-  >
-    <div
-      className="HorizontalGutter-root HorizontalGutter-half"
-    >
-      <div
-        className="Flex-root"
-      >
-        <div
-          className="Flex-flex Flex-halfItemGutter Flex-wrap"
-        >
-          <div
-            className="Typography-root Typography-bodyCopy Typography-colorTextPrimary"
-          >
-            Signed in as 
-            <span
-              className="Typography-root Typography-bodyCopyBold Typography-colorTextPrimary"
-            >
-              Markus
-            </span>
-            .
-          </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           <div
             className="HorizontalGutter-root HorizontalGutter-full"
             id="talk-comments-replyList-log--comment-0"
             role="log"
           >
             <div
-              className="IndentedComment-blur Indent-root Indent-level1"
+              className="HorizontalGutter-root HorizontalGutter-full"
+            >
+              <div
+                className="IndentedComment-blur Indent-root"
+              >
+                <div
+                  className="Indent-level1"
+                >
+                  <div
+                    className="Comment-root"
+                    role="article"
+                  >
+                    <div
+                      className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                      id="comment-uuid-0"
+                    >
+                      <div
+                        className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                      >
+                        <span
+                          className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                        >
+                          Markus
+                        </span>
+                        <div
+                          className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                        >
+                          <time
+                            className="Timestamp-root RelativeTime-root"
+                            dateTime="2018-07-06T18:24:00.000Z"
+                            title="2018-07-06T18:24:00.000Z"
+                          >
+                            2018-07-06T18:24:00.000Z
+                          </time>
+                        </div>
+                      </div>
+                      <div>
+                        <button
+                          className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
+                          id="comments-commentContainer-editButton-uuid-0"
+                          onBlur={[Function]}
+                          onClick={[Function]}
+                          onFocus={[Function]}
+                          onMouseDown={[Function]}
+                          onMouseOut={[Function]}
+                          onMouseOver={[Function]}
+                          onTouchEnd={[Function]}
+                          type="button"
+                        >
+                          Edit
+                        </button>
+                      </div>
+                    </div>
+                    <div
+                      className="HTMLContent-root"
+                      dangerouslySetInnerHTML={
+                        Object {
+                          "__html": "<strong>Hello world!</strong>",
+                        }
+                      }
+                    />
+                    <div
+                      className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                    >
+                      <button
+                        className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                        id="comments-commentContainer-replyButton-uuid-0"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
+                        onTouchEnd={[Function]}
+                        type="button"
+                      >
+                        <span>
+                          Reply
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          className="HorizontalGutter-root HorizontalGutter-full"
+        >
+          <div
+            className="Indent-root"
+          >
+            <div
+              className=""
             >
               <div
                 className="Comment-root"
@@ -1239,6 +1003,7 @@ exports[`post a reply: server response 1`] = `
               >
                 <div
                   className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
                   <div
                     className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
@@ -1246,42 +1011,26 @@ exports[`post a reply: server response 1`] = `
                     <span
                       className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      Markus
+                      Lukas
                     </span>
                     <div
                       className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
                       <time
                         className="Timestamp-root RelativeTime-root"
-                        dateTime="2018-07-06T18:24:00.000Z"
-                        title="2018-07-06T18:24:00.000Z"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
                       >
-                        2018-07-06T18:24:00.000Z
+                        2018-07-06T18:20:00.000Z
                       </time>
                     </div>
                   </div>
-                  <div>
-                    <button
-                      className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantUnderlined"
-                      id="comments-commentContainer-editButton-uuid-0"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
-                    >
-                      Edit
-                    </button>
-                  </div>
                 </div>
                 <div
                   className="HTMLContent-root"
                   dangerouslySetInnerHTML={
                     Object {
-                      "__html": "<strong>Hello world!</strong>",
+                      "__html": "What's up?",
                     }
                   }
                 />
@@ -1290,7 +1039,7 @@ exports[`post a reply: server response 1`] = `
                 >
                   <button
                     className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                    id="comments-commentContainer-replyButton-uuid-0"
+                    id="comments-commentContainer-replyButton-comment-1"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -1309,71 +1058,6 @@ exports[`post a reply: server response 1`] = `
             </div>
           </div>
         </div>
-        <div
-          className="HorizontalGutter-root HorizontalGutter-full"
-        >
-          <div
-            className="Indent-root"
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
   </section>
@@ -1389,15 +1073,14 @@ exports[`post a reply: server response 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -1411,33 +1094,10 @@ exports[`post a reply: server response 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -1450,7 +1110,6 @@ exports[`post a reply: server response 1`] = `
           className="Flex-root"
         >
           <div
-<<<<<<< HEAD
             className="Flex-flex Flex-halfItemGutter Flex-wrap"
           >
             <div
@@ -1626,77 +1285,9 @@ exports[`post a reply: server response 1`] = `
         >
           <div
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-<<<<<<< HEAD
-          <div
-            className="HorizontalGutter-root HorizontalGutter-full"
-            id="talk-comments-replyList-log--comment-0"
-            role="log"
-          >
-            <div
-              className="Indent-root Indent-level1"
+              className=""
             >
               <div
                 className="Comment-root"
@@ -1704,6 +1295,7 @@ exports[`post a reply: server response 1`] = `
               >
                 <div
                   className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
                   <div
                     className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
@@ -1730,7 +1322,7 @@ exports[`post a reply: server response 1`] = `
                   className="HTMLContent-root"
                   dangerouslySetInnerHTML={
                     Object {
-                      "__html": "<strong>Hello world! (from server)</strong>",
+                      "__html": "Joining Too",
                     }
                   }
                 />
@@ -1739,7 +1331,7 @@ exports[`post a reply: server response 1`] = `
                 >
                   <button
                     className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                    id="comments-commentContainer-replyButton-comment-x"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -1757,6 +1349,82 @@ exports[`post a reply: server response 1`] = `
               </div>
             </div>
           </div>
+          <div
+            className="HorizontalGutter-root HorizontalGutter-full"
+            id="talk-comments-replyList-log--comment-0"
+            role="log"
+          >
+            <div
+              className="HorizontalGutter-root HorizontalGutter-full"
+            >
+              <div
+                className="Indent-root"
+              >
+                <div
+                  className="Indent-level1"
+                >
+                  <div
+                    className="Comment-root"
+                    role="article"
+                  >
+                    <div
+                      className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                      id="comment-comment-x"
+                    >
+                      <div
+                        className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                      >
+                        <span
+                          className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                        >
+                          Markus
+                        </span>
+                        <div
+                          className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                        >
+                          <time
+                            className="Timestamp-root RelativeTime-root"
+                            dateTime="2018-07-06T18:24:00.000Z"
+                            title="2018-07-06T18:24:00.000Z"
+                          >
+                            2018-07-06T18:24:00.000Z
+                          </time>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      className="HTMLContent-root"
+                      dangerouslySetInnerHTML={
+                        Object {
+                          "__html": "<strong>Hello world! (from server)</strong>",
+                        }
+                      }
+                    />
+                    <div
+                      className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                    >
+                      <button
+                        className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                        id="comments-commentContainer-replyButton-comment-x"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
+                        onTouchEnd={[Function]}
+                        type="button"
+                      >
+                        <span>
+                          Reply
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
         <div
           className="HorizontalGutter-root HorizontalGutter-full"
@@ -1765,189 +1433,65 @@ exports[`post a reply: server response 1`] = `
             className="Indent-root"
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-=======
-        </div>
-        <div
-          className="HorizontalGutter-root HorizontalGutter-full"
-          id="talk-comments-replyList-log--comment-0"
-          role="log"
-        >
-          <div
-            className="HorizontalGutter-root HorizontalGutter-full"
-          >
-            <div
-              className="Indent-root"
-            >
-              <div
-                className="Indent-level1"
-              >
-                <div
-                  className="Comment-root"
-                  role="article"
-                >
-                  <div
-                    className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                    id="comment-comment-x"
-                  >
+                      Lukas
+                    </span>
                     <div
-                      className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
-                      <span
-                        className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
                       >
-                        Markus
-                      </span>
-                      <div
-                        className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                      >
-                        <time
-                          className="Timestamp-root RelativeTime-root"
-                          dateTime="2018-07-06T18:24:00.000Z"
-                          title="2018-07-06T18:24:00.000Z"
-                        >
-                          2018-07-06T18:24:00.000Z
-                        </time>
-                      </div>
+                        2018-07-06T18:20:00.000Z
+                      </time>
                     </div>
                   </div>
-                  <div
-                    className="HTMLContent-root"
-                    dangerouslySetInnerHTML={
-                      Object {
-                        "__html": "<strong>Hello world! (from server)</strong>",
-                      }
-                    }
-                  />
-                  <div
-                    className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-                  >
-                    <button
-                      className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                      id="comments-commentContainer-replyButton-comment-x"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
-                    >
-                      <span>
-                        Reply
-                      </span>
-                    </button>
-                  </div>
                 </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        className="HorizontalGutter-root HorizontalGutter-full"
-      >
-        <div
-          className="Indent-root"
-        >
-          <div
-            className=""
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-1"
-              >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
-                    >
-                      2018-07-06T18:20:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -1967,15 +1511,14 @@ exports[`renders comment stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -1989,33 +1532,10 @@ exports[`renders comment stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -2202,71 +1722,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -2275,71 +1792,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
index 618ef8af0..5e63006ac 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderReplies.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`renders comment stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,134 +30,12 @@ exports[`renders comment stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-<<<<<<< HEAD
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
-=======
-        <div
-          aria-hidden="true"
-        >
-          <div>
-            <div
-              className=""
-            >
-              <div
-                className=" RTE-toolbarDisabled Toolbar-toolbar"
-              >
-                <button
-                  className="Button-button"
-                  disabled={false}
-                  onClick={[Function]}
-                  title="Bold"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    format_bold
-                  </span>
-                </button>
-                <button
-                  className="Button-button"
-                  disabled={false}
-                  onClick={[Function]}
-                  title="Italic"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    format_italic
-                  </span>
-                </button>
-                <button
-                  className="Button-button"
-                  disabled={false}
-                  onClick={[Function]}
-                  title="Blockquote"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    format_quote
-                  </span>
-                </button>
-              </div>
-              <div
-                aria-hidden="true"
-                className="RTE-placeholder RTE-placeholder "
-              >
-                Post a comment
-              </div>
-              <div
-                aria-placeholder="Post a comment"
-                className="RTE-contentEditable RTE-content  RTE-contentEditableDisabled"
-                contentEditable={false}
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "",
-                  }
-                }
-                disabled={true}
-                onBlur={[Function]}
-                onChange={[Function]}
-                onCut={[Function]}
-                onFocus={[Function]}
-                onInput={[Function]}
-                onKeyDown={[Function]}
-                onPaste={[Function]}
-                onSelect={[Function]}
-              />
-            </div>
-          </div>
-        </div>
-        <button
-          className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth Button-disabled"
-          disabled={true}
-          onBlur={[Function]}
-          onFocus={[Function]}
-          onMouseDown={[Function]}
-          onMouseOut={[Function]}
-          onMouseOver={[Function]}
-          onTouchEnd={[Function]}
-          type="submit"
-        >
-          Sign in and Join the Conversation
-        </button>
-      </div>
-    </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
     <div
       className="HorizontalGutter-root Stream-root HorizontalGutter-double"
     >
@@ -168,7 +45,6 @@ exports[`renders comment stream 1`] = `
         <div
           className="Flex-root Flex-flex Flex-itemGutter Flex-alignCenter"
         >
-<<<<<<< HEAD
           <button
             className="BaseButton-root Button-root Button-sizeSmall Button-colorPrimary Button-variantUnderlined"
             onBlur={[Function]}
@@ -291,7 +167,7 @@ exports[`renders comment stream 1`] = `
             onTouchEnd={[Function]}
             type="submit"
           >
-            Sign in and join the conversation
+            Sign in and Join the Conversation
           </button>
         </div>
       </div>
@@ -306,159 +182,9 @@ exports[`renders comment stream 1`] = `
         >
           <div
             className="Indent-root"
-=======
-          <div
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-<<<<<<< HEAD
-        <div
-          className="HorizontalGutter-root HorizontalGutter-full"
-        >
-          <div
-            className="Indent-root"
-=======
-      </div>
-      <div
-        className="HorizontalGutter-root HorizontalGutter-full"
-      >
-        <div
-          className="Indent-root"
-        >
-          <div
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-          >
-            <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-with-deep-replies"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "I like yoghurt",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-<<<<<<< HEAD
-                  id="comments-commentContainer-replyButton-comment-with-replies"
-=======
-                  id="comments-commentContainer-replyButton-comment-with-deep-replies"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            className="HorizontalGutter-root HorizontalGutter-full"
-            id="talk-comments-replyList-log--comment-with-replies"
-            role="log"
-          >
-            <div
-              className="Indent-root Indent-level1"
+              className=""
             >
               <div
                 className="Comment-root"
@@ -466,6 +192,7 @@ exports[`renders comment stream 1`] = `
               >
                 <div
                   className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
                   <div
                     className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
@@ -518,8 +245,16 @@ exports[`renders comment stream 1`] = `
                 </div>
               </div>
             </div>
+          </div>
+        </div>
+        <div
+          className="HorizontalGutter-root HorizontalGutter-full"
+        >
+          <div
+            className="Indent-root"
+          >
             <div
-              className="Indent-root Indent-level1"
+              className=""
             >
               <div
                 className="Comment-root"
@@ -527,6 +262,7 @@ exports[`renders comment stream 1`] = `
               >
                 <div
                   className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-with-deep-replies"
                 >
                   <div
                     className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
@@ -534,17 +270,17 @@ exports[`renders comment stream 1`] = `
                     <span
                       className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      Lukas
+                      Markus
                     </span>
                     <div
                       className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
                       <time
                         className="Timestamp-root RelativeTime-root"
-                        dateTime="2018-07-06T18:20:00.000Z"
-                        title="2018-07-06T18:20:00.000Z"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
                       >
-                        2018-07-06T18:20:00.000Z
+                        2018-07-06T18:24:00.000Z
                       </time>
                     </div>
                   </div>
@@ -553,7 +289,7 @@ exports[`renders comment stream 1`] = `
                   className="HTMLContent-root"
                   dangerouslySetInnerHTML={
                     Object {
-                      "__html": "What's up?",
+                      "__html": "I like yoghurt",
                     }
                   }
                 />
@@ -562,7 +298,7 @@ exports[`renders comment stream 1`] = `
                 >
                   <button
                     className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                    id="comments-commentContainer-replyButton-comment-1"
+                    id="comments-commentContainer-replyButton-comment-with-deep-replies"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -580,293 +316,293 @@ exports[`renders comment stream 1`] = `
               </div>
             </div>
           </div>
-        </div>
-        <div
-          className="HorizontalGutter-root HorizontalGutter-full"
-          id="talk-comments-replyList-log--comment-with-deep-replies"
-          role="log"
-        >
           <div
             className="HorizontalGutter-root HorizontalGutter-full"
+            id="talk-comments-replyList-log--comment-with-deep-replies"
+            role="log"
           >
             <div
-              className="Indent-root"
+              className="HorizontalGutter-root HorizontalGutter-full"
             >
               <div
-                className="Indent-level1"
+                className="Indent-root"
               >
                 <div
-                  className="Comment-root"
-                  role="article"
+                  className="Indent-level1"
                 >
                   <div
-                    className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                    id="comment-comment-with-replies"
+                    className="Comment-root"
+                    role="article"
                   >
                     <div
-                      className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                      className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                      id="comment-comment-with-replies"
                     >
-                      <span
-                        className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                      >
-                        Markus
-                      </span>
                       <div
-                        className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                        className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                       >
-                        <time
-                          className="Timestamp-root RelativeTime-root"
-                          dateTime="2018-07-06T18:24:00.000Z"
-                          title="2018-07-06T18:24:00.000Z"
+                        <span
+                          className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                         >
-                          2018-07-06T18:24:00.000Z
-                        </time>
+                          Markus
+                        </span>
+                        <div
+                          className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                        >
+                          <time
+                            className="Timestamp-root RelativeTime-root"
+                            dateTime="2018-07-06T18:24:00.000Z"
+                            title="2018-07-06T18:24:00.000Z"
+                          >
+                            2018-07-06T18:24:00.000Z
+                          </time>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      className="HTMLContent-root"
+                      dangerouslySetInnerHTML={
+                        Object {
+                          "__html": "I like yoghurt",
+                        }
+                      }
+                    />
+                    <div
+                      className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                    >
+                      <button
+                        className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                        id="comments-commentContainer-replyButton-comment-with-replies"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
+                        onTouchEnd={[Function]}
+                        type="button"
+                      >
+                        <span>
+                          Reply
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div
+                className="HorizontalGutter-root HorizontalGutter-full"
+                id="talk-comments-replyList-log--comment-with-replies"
+                role="log"
+              >
+                <div
+                  className="HorizontalGutter-root HorizontalGutter-full"
+                >
+                  <div
+                    className="Indent-root"
+                  >
+                    <div
+                      className="Indent-level2"
+                    >
+                      <div
+                        className="Comment-root"
+                        role="article"
+                      >
+                        <div
+                          className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                          id="comment-comment-3"
+                        >
+                          <div
+                            className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                          >
+                            <span
+                              className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                            >
+                              Isabelle
+                            </span>
+                            <div
+                              className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                            >
+                              <time
+                                className="Timestamp-root RelativeTime-root"
+                                dateTime="2018-07-06T18:14:00.000Z"
+                                title="2018-07-06T18:14:00.000Z"
+                              >
+                                2018-07-06T18:14:00.000Z
+                              </time>
+                            </div>
+                          </div>
+                        </div>
+                        <div
+                          className="HTMLContent-root"
+                          dangerouslySetInnerHTML={
+                            Object {
+                              "__html": "Comment Body 3",
+                            }
+                          }
+                        />
+                        <div
+                          className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                        >
+                          <button
+                            className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                            id="comments-commentContainer-replyButton-comment-3"
+                            onBlur={[Function]}
+                            onClick={[Function]}
+                            onFocus={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
+                            onTouchEnd={[Function]}
+                            type="button"
+                          >
+                            <span>
+                              Reply
+                            </span>
+                          </button>
+                        </div>
                       </div>
                     </div>
                   </div>
+                </div>
+                <div
+                  className="HorizontalGutter-root HorizontalGutter-full"
+                >
                   <div
-                    className="HTMLContent-root"
-                    dangerouslySetInnerHTML={
-                      Object {
-                        "__html": "I like yoghurt",
-                      }
-                    }
-                  />
-                  <div
-                    className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                    className="Indent-root"
                   >
-                    <button
-                      className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                      id="comments-commentContainer-replyButton-comment-with-replies"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
+                    <div
+                      className="Indent-level2"
                     >
-                      <span>
-                        Reply
-                      </span>
-                    </button>
+                      <div
+                        className="Comment-root"
+                        role="article"
+                      >
+                        <div
+                          className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                          id="comment-comment-4"
+                        >
+                          <div
+                            className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                          >
+                            <span
+                              className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                            >
+                              Isabelle
+                            </span>
+                            <div
+                              className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                            >
+                              <time
+                                className="Timestamp-root RelativeTime-root"
+                                dateTime="2018-07-06T18:14:00.000Z"
+                                title="2018-07-06T18:14:00.000Z"
+                              >
+                                2018-07-06T18:14:00.000Z
+                              </time>
+                            </div>
+                          </div>
+                        </div>
+                        <div
+                          className="HTMLContent-root"
+                          dangerouslySetInnerHTML={
+                            Object {
+                              "__html": "Comment Body 4",
+                            }
+                          }
+                        />
+                        <div
+                          className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                        >
+                          <button
+                            className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                            id="comments-commentContainer-replyButton-comment-4"
+                            onBlur={[Function]}
+                            onClick={[Function]}
+                            onFocus={[Function]}
+                            onMouseDown={[Function]}
+                            onMouseOut={[Function]}
+                            onMouseOver={[Function]}
+                            onTouchEnd={[Function]}
+                            type="button"
+                          >
+                            <span>
+                              Reply
+                            </span>
+                          </button>
+                        </div>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
             <div
               className="HorizontalGutter-root HorizontalGutter-full"
-              id="talk-comments-replyList-log--comment-with-replies"
-              role="log"
             >
               <div
-                className="HorizontalGutter-root HorizontalGutter-full"
+                className="Indent-root"
               >
                 <div
-                  className="Indent-root"
+                  className="Indent-level1"
                 >
                   <div
-                    className="Indent-level2"
+                    className="Comment-root"
+                    role="article"
                   >
                     <div
-                      className="Comment-root"
-                      role="article"
+                      className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                      id="comment-comment-5"
                     >
                       <div
-                        className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                        id="comment-comment-3"
+                        className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                       >
-                        <div
-                          className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                        <span
+                          className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                         >
-                          <span
-                            className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                          Isabelle
+                        </span>
+                        <div
+                          className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                        >
+                          <time
+                            className="Timestamp-root RelativeTime-root"
+                            dateTime="2018-07-06T18:14:00.000Z"
+                            title="2018-07-06T18:14:00.000Z"
                           >
-                            Isabelle
-                          </span>
-                          <div
-                            className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                          >
-                            <time
-                              className="Timestamp-root RelativeTime-root"
-                              dateTime="2018-07-06T18:14:00.000Z"
-                              title="2018-07-06T18:14:00.000Z"
-                            >
-                              2018-07-06T18:14:00.000Z
-                            </time>
-                          </div>
+                            2018-07-06T18:14:00.000Z
+                          </time>
                         </div>
                       </div>
-                      <div
-                        className="HTMLContent-root"
-                        dangerouslySetInnerHTML={
-                          Object {
-                            "__html": "Comment Body 3",
-                          }
-                        }
-                      />
-                      <div
-                        className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-                      >
-                        <button
-                          className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                          id="comments-commentContainer-replyButton-comment-3"
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseOut={[Function]}
-                          onMouseOver={[Function]}
-                          onTouchEnd={[Function]}
-                          type="button"
-                        >
-                          <span>
-                            Reply
-                          </span>
-                        </button>
-                      </div>
                     </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HorizontalGutter-root HorizontalGutter-full"
-              >
-                <div
-                  className="Indent-root"
-                >
-                  <div
-                    className="Indent-level2"
-                  >
                     <div
-                      className="Comment-root"
-                      role="article"
-                    >
-                      <div
-                        className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                        id="comment-comment-4"
-                      >
-                        <div
-                          className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                        >
-                          <span
-                            className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                          >
-                            Isabelle
-                          </span>
-                          <div
-                            className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                          >
-                            <time
-                              className="Timestamp-root RelativeTime-root"
-                              dateTime="2018-07-06T18:14:00.000Z"
-                              title="2018-07-06T18:14:00.000Z"
-                            >
-                              2018-07-06T18:14:00.000Z
-                            </time>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        className="HTMLContent-root"
-                        dangerouslySetInnerHTML={
-                          Object {
-                            "__html": "Comment Body 4",
-                          }
+                      className="HTMLContent-root"
+                      dangerouslySetInnerHTML={
+                        Object {
+                          "__html": "Comment Body 5",
                         }
-                      />
-                      <div
-                        className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-                      >
-                        <button
-                          className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                          id="comments-commentContainer-replyButton-comment-4"
-                          onBlur={[Function]}
-                          onClick={[Function]}
-                          onFocus={[Function]}
-                          onMouseDown={[Function]}
-                          onMouseOut={[Function]}
-                          onMouseOver={[Function]}
-                          onTouchEnd={[Function]}
-                          type="button"
-                        >
-                          <span>
-                            Reply
-                          </span>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            className="HorizontalGutter-root HorizontalGutter-full"
-          >
-            <div
-              className="Indent-root"
-            >
-              <div
-                className="Indent-level1"
-              >
-                <div
-                  className="Comment-root"
-                  role="article"
-                >
-                  <div
-                    className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                    id="comment-comment-5"
-                  >
-                    <div
-                      className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                    >
-                      <span
-                        className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                      >
-                        Isabelle
-                      </span>
-                      <div
-                        className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                      >
-                        <time
-                          className="Timestamp-root RelativeTime-root"
-                          dateTime="2018-07-06T18:14:00.000Z"
-                          title="2018-07-06T18:14:00.000Z"
-                        >
-                          2018-07-06T18:14:00.000Z
-                        </time>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="HTMLContent-root"
-                    dangerouslySetInnerHTML={
-                      Object {
-                        "__html": "Comment Body 5",
                       }
-                    }
-                  />
-                  <div
-                    className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-                  >
-                    <button
-                      className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                      id="comments-commentContainer-replyButton-comment-5"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
+                    />
+                    <div
+                      className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                     >
-                      <span>
-                        Reply
-                      </span>
-                    </button>
+                      <button
+                        className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                        id="comments-commentContainer-replyButton-comment-5"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
+                        onTouchEnd={[Function]}
+                        type="button"
+                      >
+                        <span>
+                          Reply
+                        </span>
+                      </button>
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
index 7d82807cf..51ae4be10 100644
--- a/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/renderStream.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`renders comment stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,33 +30,10 @@ exports[`renders comment stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
     <div
@@ -191,25 +167,9 @@ exports[`renders comment stream 1`] = `
             onTouchEnd={[Function]}
             type="submit"
           >
-            Sign in and join the conversation
+            Sign in and Join the Conversation
           </button>
         </div>
-<<<<<<< HEAD
-=======
-        <button
-          className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth Button-disabled"
-          disabled={true}
-          onBlur={[Function]}
-          onFocus={[Function]}
-          onMouseDown={[Function]}
-          onMouseOut={[Function]}
-          onMouseOver={[Function]}
-          onTouchEnd={[Function]}
-          type="submit"
-        >
-          Sign in and Join the Conversation
-        </button>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
       </div>
       <div
         aria-live="polite"
@@ -221,71 +181,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-0"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:24:00.000Z
-                    </time>
+                      Markus
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
+                      >
+                        2018-07-06T18:24:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "Joining Too",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-0"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -294,80 +251,68 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
+              className=""
             >
               <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-<<<<<<< HEAD
-=======
-                id="comment-comment-1"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+                className="Comment-root"
+                role="article"
               >
                 <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                  className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-1"
                 >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-<<<<<<< HEAD
-                  >
-                    Lukas
-                  </span>
                   <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
                   >
-=======
-                  >
-                    Lukas
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:20:00.000Z"
-                      title="2018-07-06T18:20:00.000Z"
+                    <span
+                      className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      2018-07-06T18:20:00.000Z
-                    </time>
+                      Lukas
+                    </span>
+                    <div
+                      className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                    >
+                      <time
+                        className="Timestamp-root RelativeTime-root"
+                        dateTime="2018-07-06T18:20:00.000Z"
+                        title="2018-07-06T18:20:00.000Z"
+                      >
+                        2018-07-06T18:20:00.000Z
+                      </time>
+                    </div>
                   </div>
                 </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "What's up?",
+                <div
+                  className="HTMLContent-root"
+                  dangerouslySetInnerHTML={
+                    Object {
+                      "__html": "What's up?",
+                    }
                   }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-1"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
+                />
+                <div
+                  className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
                 >
-                  <span>
-                    Reply
-                  </span>
-                </button>
+                  <button
+                    className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                    id="comments-commentContainer-replyButton-comment-1"
+                    onBlur={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onMouseDown={[Function]}
+                    onMouseOut={[Function]}
+                    onMouseOver={[Function]}
+                    onTouchEnd={[Function]}
+                    type="button"
+                  >
+                    <span>
+                      Reply
+                    </span>
+                  </button>
+                </div>
               </div>
             </div>
           </div>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
index e8f6ccb89..33cb84d6b 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
@@ -9,15 +9,14 @@ exports[`renders comment stream 1`] = `
     role="tablist"
   >
     <li
-      className="Tab-root Tab-primary Tab-active"
-      id="COMMENTS-tab"
-      onClick={[Function]}
+      className="Tab-root"
+      id="tab-COMMENTS"
       role="presentation"
     >
       <button
-        aria-controls="COMMENTS"
+        aria-controls="tabPane-COMMENTS"
         aria-selected={true}
-        className="BaseButton-root"
+        className="BaseButton-root Tab-button Tab-primary Tab-active"
         onBlur={[Function]}
         onClick={[Function]}
         onFocus={[Function]}
@@ -31,134 +30,12 @@ exports[`renders comment stream 1`] = `
         Comments
       </button>
     </li>
-    <li
-      className="Tab-root Tab-primary"
-      id="PROFILE-tab"
-      onClick={[Function]}
-      role="presentation"
-    >
-      <button
-        aria-controls="PROFILE"
-        aria-selected={false}
-        className="BaseButton-root"
-        onBlur={[Function]}
-        onClick={[Function]}
-        onFocus={[Function]}
-        onMouseDown={[Function]}
-        onMouseOut={[Function]}
-        onMouseOver={[Function]}
-        onTouchEnd={[Function]}
-        role="tab"
-        type="button"
-      >
-<<<<<<< HEAD
-        My Profile
-      </button>
-    </li>
   </ul>
   <section
-    aria-labelledby="COMMENTS-tab"
-    id="COMMENTS"
+    aria-labelledby="tab-COMMENTS"
+    id="tabPane-COMMENTS"
     role="tabpanel"
   >
-=======
-        <div
-          aria-hidden="true"
-        >
-          <div>
-            <div
-              className=""
-            >
-              <div
-                className=" RTE-toolbarDisabled Toolbar-toolbar"
-              >
-                <button
-                  className="Button-button"
-                  disabled={false}
-                  onClick={[Function]}
-                  title="Bold"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    format_bold
-                  </span>
-                </button>
-                <button
-                  className="Button-button"
-                  disabled={false}
-                  onClick={[Function]}
-                  title="Italic"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    format_italic
-                  </span>
-                </button>
-                <button
-                  className="Button-button"
-                  disabled={false}
-                  onClick={[Function]}
-                  title="Blockquote"
-                  type="button"
-                >
-                  <span
-                    aria-hidden="true"
-                    className="Icon-root Icon-md"
-                  >
-                    format_quote
-                  </span>
-                </button>
-              </div>
-              <div
-                aria-hidden="true"
-                className="RTE-placeholder RTE-placeholder "
-              >
-                Post a comment
-              </div>
-              <div
-                aria-placeholder="Post a comment"
-                className="RTE-contentEditable RTE-content  RTE-contentEditableDisabled"
-                contentEditable={false}
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "",
-                  }
-                }
-                disabled={true}
-                onBlur={[Function]}
-                onChange={[Function]}
-                onCut={[Function]}
-                onFocus={[Function]}
-                onInput={[Function]}
-                onKeyDown={[Function]}
-                onPaste={[Function]}
-                onSelect={[Function]}
-              />
-            </div>
-          </div>
-        </div>
-        <button
-          className="BaseButton-root Button-root Button-sizeRegular Button-colorPrimary Button-variantFilled Button-fullWidth Button-disabled"
-          disabled={true}
-          onBlur={[Function]}
-          onFocus={[Function]}
-          onMouseDown={[Function]}
-          onMouseOut={[Function]}
-          onMouseOver={[Function]}
-          onTouchEnd={[Function]}
-          type="submit"
-        >
-          Sign in and Join the Conversation
-        </button>
-      </div>
-    </div>
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
     <div
       className="HorizontalGutter-root Stream-root HorizontalGutter-double"
     >
@@ -199,7 +76,6 @@ exports[`renders comment stream 1`] = `
           className="HorizontalGutter-root PostCommentFormFake-root HorizontalGutter-full"
         >
           <div
-<<<<<<< HEAD
             aria-hidden="true"
           >
             <div>
@@ -291,7 +167,7 @@ exports[`renders comment stream 1`] = `
             onTouchEnd={[Function]}
             type="submit"
           >
-            Sign in and join the conversation
+            Sign in and Join the Conversation
           </button>
         </div>
       </div>
@@ -306,153 +182,9 @@ exports[`renders comment stream 1`] = `
         >
           <div
             className="Indent-root"
-=======
-            className=""
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
           >
             <div
-              className="Comment-root"
-              role="article"
-            >
-              <div
-                className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                id="comment-comment-0"
-              >
-                <div
-                  className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                >
-                  <span
-                    className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                  >
-                    Markus
-                  </span>
-                  <div
-                    className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                  >
-                    <time
-                      className="Timestamp-root RelativeTime-root"
-                      dateTime="2018-07-06T18:24:00.000Z"
-                      title="2018-07-06T18:24:00.000Z"
-                    >
-                      2018-07-06T18:24:00.000Z
-                    </time>
-                  </div>
-                </div>
-              </div>
-              <div
-                className="HTMLContent-root"
-                dangerouslySetInnerHTML={
-                  Object {
-                    "__html": "Joining Too",
-                  }
-                }
-              />
-              <div
-                className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-              >
-                <button
-                  className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                  id="comments-commentContainer-replyButton-comment-0"
-                  onBlur={[Function]}
-                  onClick={[Function]}
-                  onFocus={[Function]}
-                  onMouseDown={[Function]}
-                  onMouseOut={[Function]}
-                  onMouseOver={[Function]}
-                  onTouchEnd={[Function]}
-                  type="button"
-                >
-                  <span>
-                    Reply
-                  </span>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          className="HorizontalGutter-root HorizontalGutter-full"
-          id="talk-comments-replyList-log--comment-0"
-          role="log"
-        >
-          <div
-            className="HorizontalGutter-root HorizontalGutter-full"
-          >
-            <div
-              className="Indent-root"
-            >
-              <div
-                className="Indent-level1"
-              >
-                <div
-                  className="Comment-root"
-                  role="article"
-                >
-                  <div
-                    className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
-                    id="comment-comment-1"
-                  >
-                    <div
-                      className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
-                    >
-                      <span
-                        className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
-                      >
-                        Lukas
-                      </span>
-                      <div
-                        className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
-                      >
-                        <time
-                          className="Timestamp-root RelativeTime-root"
-                          dateTime="2018-07-06T18:20:00.000Z"
-                          title="2018-07-06T18:20:00.000Z"
-                        >
-                          2018-07-06T18:20:00.000Z
-                        </time>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="HTMLContent-root"
-                    dangerouslySetInnerHTML={
-                      Object {
-                        "__html": "What's up?",
-                      }
-                    }
-                  />
-                  <div
-                    className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
-                  >
-                    <button
-                      className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                      id="comments-commentContainer-replyButton-comment-1"
-                      onBlur={[Function]}
-                      onClick={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onMouseOut={[Function]}
-                      onMouseOver={[Function]}
-                      onTouchEnd={[Function]}
-                      type="button"
-                    >
-                      <span>
-                        Reply
-                      </span>
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-<<<<<<< HEAD
-            className="HorizontalGutter-root HorizontalGutter-full"
-            id="talk-comments-replyList-log--comment-0"
-            role="log"
-          >
-            <div
-              className="Indent-root Indent-level1"
+              className=""
             >
               <div
                 className="Comment-root"
@@ -460,6 +192,7 @@ exports[`renders comment stream 1`] = `
               >
                 <div
                   className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                  id="comment-comment-0"
                 >
                   <div
                     className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
@@ -467,17 +200,17 @@ exports[`renders comment stream 1`] = `
                     <span
                       className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
                     >
-                      Lukas
+                      Markus
                     </span>
                     <div
                       className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
                     >
                       <time
                         className="Timestamp-root RelativeTime-root"
-                        dateTime="2018-07-06T18:20:00.000Z"
-                        title="2018-07-06T18:20:00.000Z"
+                        dateTime="2018-07-06T18:24:00.000Z"
+                        title="2018-07-06T18:24:00.000Z"
                       >
-                        2018-07-06T18:20:00.000Z
+                        2018-07-06T18:24:00.000Z
                       </time>
                     </div>
                   </div>
@@ -486,7 +219,7 @@ exports[`renders comment stream 1`] = `
                   className="HTMLContent-root"
                   dangerouslySetInnerHTML={
                     Object {
-                      "__html": "What's up?",
+                      "__html": "Joining Too",
                     }
                   }
                 />
@@ -495,7 +228,7 @@ exports[`renders comment stream 1`] = `
                 >
                   <button
                     className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
-                    id="comments-commentContainer-replyButton-comment-1"
+                    id="comments-commentContainer-replyButton-comment-0"
                     onBlur={[Function]}
                     onClick={[Function]}
                     onFocus={[Function]}
@@ -512,35 +245,105 @@ exports[`renders comment stream 1`] = `
                 </div>
               </div>
             </div>
-            <div
-              className="Indent-root Indent-level1 Indent-noBorder"
-=======
-            className="Indent-root"
+          </div>
+          <div
+            className="HorizontalGutter-root HorizontalGutter-full"
+            id="talk-comments-replyList-log--comment-0"
+            role="log"
           >
             <div
-              className="Indent-level1 Indent-noBorder"
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
+              className="HorizontalGutter-root HorizontalGutter-full"
             >
-              <button
-                aria-controls="talk-comments-replyList-log--comment-0"
-                className="BaseButton-root Button-root Button-sizeRegular Button-colorRegular Button-variantOutlined Button-fullWidth"
-                disabled={false}
-                id="talk-comments-replyList-showAll--comment-0"
-                onBlur={[Function]}
-                onClick={[Function]}
-                onFocus={[Function]}
-                onMouseDown={[Function]}
-                onMouseOut={[Function]}
-                onMouseOver={[Function]}
-                onTouchEnd={[Function]}
-                type="button"
+              <div
+                className="Indent-root"
               >
-<<<<<<< HEAD
-                Show all
-=======
-                Show All
->>>>>>> 65156c052820a6676b17c2fb7ff5df56b3183d47
-              </button>
+                <div
+                  className="Indent-level1"
+                >
+                  <div
+                    className="Comment-root"
+                    role="article"
+                  >
+                    <div
+                      className="Flex-root Comment-topBar Flex-flex Flex-justifySpaceBetween Flex-directionRow"
+                      id="comment-comment-1"
+                    >
+                      <div
+                        className="Flex-root Flex-flex Flex-halfItemGutter Flex-alignBaseline Flex-directionColumn"
+                      >
+                        <span
+                          className="Typography-root Typography-heading3 Typography-colorTextPrimary Username-root"
+                        >
+                          Lukas
+                        </span>
+                        <div
+                          className="Flex-root Flex-flex Flex-itemGutter Flex-alignBaseline Flex-directionRow"
+                        >
+                          <time
+                            className="Timestamp-root RelativeTime-root"
+                            dateTime="2018-07-06T18:20:00.000Z"
+                            title="2018-07-06T18:20:00.000Z"
+                          >
+                            2018-07-06T18:20:00.000Z
+                          </time>
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      className="HTMLContent-root"
+                      dangerouslySetInnerHTML={
+                        Object {
+                          "__html": "What's up?",
+                        }
+                      }
+                    />
+                    <div
+                      className="Flex-root Comment-footer Flex-flex Flex-halfItemGutter Flex-directionRow"
+                    >
+                      <button
+                        className="BaseButton-root Button-root Button-sizeSmall Button-colorRegular Button-variantGhost"
+                        id="comments-commentContainer-replyButton-comment-1"
+                        onBlur={[Function]}
+                        onClick={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onMouseOut={[Function]}
+                        onMouseOver={[Function]}
+                        onTouchEnd={[Function]}
+                        type="button"
+                      >
+                        <span>
+                          Reply
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div
+              className="Indent-root"
+            >
+              <div
+                className="Indent-level1 Indent-noBorder"
+              >
+                <button
+                  aria-controls="talk-comments-replyList-log--comment-0"
+                  className="BaseButton-root Button-root Button-sizeRegular Button-colorRegular Button-variantOutlined Button-fullWidth"
+                  disabled={false}
+                  id="talk-comments-replyList-showAll--comment-0"
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onMouseDown={[Function]}
+                  onMouseOut={[Function]}
+                  onMouseOver={[Function]}
+                  onTouchEnd={[Function]}
+                  type="button"
+                >
+                  Show All
+                </button>
+              </div>
             </div>
           </div>
         </div>