diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index e35b309721c1f21e30f7a366a5a2c683522cb618..b4a6fb25c57b1ab0943e51159bb1b6bf5bdea7a1 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -687,13 +687,10 @@ class UIRoot extends Component {
   };
 
   renderEntryStartPanel = () => {
-<<<<<<< HEAD
     const textRows = this.state.pendingMessage.split("\n").length;
     const pendingMessageTextareaHeight = textRows * 28 + "px";
     const pendingMessageFieldHeight = textRows * 28 + 20 + "px";
-=======
     const hasPush = navigator.serviceWorker && "PushManager" in window;
->>>>>>> 58f4eba535de1894589cb9dfa455da3e3376fb8d
 
     return (
       <div className={entryStyles.entryPanel}>