diff --git a/src/components/Content.js b/src/components/Content.js
index e6bb036a3bd..6e60915a8a2 100644
--- a/src/components/Content.js
+++ b/src/components/Content.js
@@ -88,7 +88,6 @@ const Content = props => {
     className={contentClassNames}
     onClick={clickOnEmptySpace}
   >
-<<<<<<< HEAD
     {search != null
       ? <Search />
       : <React.Fragment>
@@ -98,22 +97,6 @@ const Content = props => {
         />}
       </React.Fragment>
     }
-=======
-
-    <div onClick={stopEventPropagation}>
-
-      {search != null
-        ? <Search />
-        : <React.Fragment>
-          {rootThoughts.length === 0 ? <NewThoughtInstructions children={rootThoughts} /> : <Subthoughts
-            thoughtsRanked={RANKED_ROOT}
-            expandable={true}
-          />}
-        </React.Fragment>
-      }
-
-    </div>
->>>>>>> 03e3f41... added position, unmount and mount animation
   </div>
 }