diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml
index bdcb995..8ddee10 100644
--- a/client/src/main/resources/fxml/ChatScene.fxml
+++ b/client/src/main/resources/fxml/ChatScene.fxml
@@ -113,71 +113,8 @@
          <GridPane.margin>
             <Insets right="1.0" />
          </GridPane.margin>
-<<<<<<< HEAD
       </TabPane>
 		<HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0">
-=======
-         <children>
-            <VBox id="search-panel" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="80.0" prefWidth="316.0">
-               <children>
-                  <Label id="contact-search-enter-container" maxHeight="30.0" minHeight="30.0" prefHeight="30.0" prefWidth="325.0">
-                     <graphic>
-                        <TextArea id="contactSearchInput" fx:id="contactSearch" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#searchContacts" onKeyTyped="#searchContacts" prefHeight="30.0" prefWidth="200.0" promptText="Search Contacts">
-                           <font>
-                              <Font size="14.0" />
-                           </font>
-                           <padding>
-                              <Insets left="12.0" right="12.0" />
-                           </padding>
-                        </TextArea>
-                     </graphic>
-                     <VBox.margin>
-                        <Insets left="10.0" right="10.0" top="3.0" />
-                     </VBox.margin>
-                  </Label>
-                  <HBox id="underline" alignment="TOP_CENTER" prefHeight="41.0" prefWidth="296.0" spacing="5.0">
-                     <children>
-      						<Button mnemonicParsing="true" onAction="#addContactButtonClicked" prefWidth="100.0" text=" Add Contact">
-      							<padding>
-      								<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-      							</padding>
-                           <HBox.margin>
-                              <Insets />
-                           </HBox.margin>
-      						</Button>
-                        <Button fx:id="newGroupButton" mnemonicParsing="false" prefWidth="100.0" text="New Group">
-                           <HBox.margin>
-                              <Insets />
-                           </HBox.margin>
-                           <padding>
-                              <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
-                           </padding></Button>
-                     </children>
-                     <VBox.margin>
-                        <Insets left="10.0" right="10.0" top="5.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets top="3.0" />
-                     </padding>
-                  </HBox>
-               </children>
-            </VBox>
-      		<ListView id="chatList" fx:id="chatList" focusTraversable="false" onMouseClicked="#chatListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
-      			<contextMenu>
-      				<ContextMenu anchorLocation="CONTENT_TOP_LEFT">
-      					<items>
-      						<MenuItem fx:id="deleteContactMenuItem" mnemonicParsing="false" onAction="#deleteContact" text="Delete" />
-      					</items>
-      				</ContextMenu>
-      			</contextMenu>
-               <padding>
-                  <Insets bottom="5.0" left="5.0" right="2.0" top="5.0" />
-               </padding>
-      		</ListView>
-         </children>
-      </VBox>
-		<HBox id="topBar" alignment="CENTER_LEFT" prefHeight="100.0">
->>>>>>> refs/heads/develop
 			<children>
 				<ImageView id="profile-pic" fx:id="clientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true">
 					<HBox.margin>