diff --git a/public/index.html b/public/index.html
index 59d0dad..abb066f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,29 +1,20 @@
 <!DOCTYPE html>
-<<<<<<< HEAD
-<html>
-=======
 <html lang="en">
->>>>>>> dev-mq
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-<<<<<<< HEAD
-    <title>web-gantt</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but web-gantt doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-=======
-    <title>table_dropdown</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but table_dropdown doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
->>>>>>> dev-mq
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <title>table_dropdown</title>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but table_dropdown doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>
\ No newline at end of file
