diff --git a/client/index.html b/client/index.html
index 2f9e0886..155dfede 100644
--- a/client/index.html
+++ b/client/index.html
@@ -10,10 +10,7 @@
   <link href="https://use.typekit.net/tck7ptw.css" rel="stylesheet">
   <!--  FIXME: replace with own css -->
   <link href="https://surveyjs.azureedge.net/1.0.87/survey.css" type="text/css" rel="stylesheet"/>
-<<<<<<< HEAD
-=======
 
->>>>>>> Add import
 
   <script>
     window.UPLOADCARE_PUBLIC_KEY = '78212ff39934a59775ac';