diff --git a/public/index.html b/public/index.html
index be7d5f3..add43cb 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,6 +9,7 @@
       name="description"
       content="Web site created using create-react-app"
     />
+    <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
diff --git a/src/components/timeLine/editorList/EditorList.tsx b/src/components/timeLine/editorList/EditorList.tsx
index 870ddfa..87f1b8f 100644
--- a/src/components/timeLine/editorList/EditorList.tsx
+++ b/src/components/timeLine/editorList/EditorList.tsx
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import React, { useEffect, useState } from 'react';
 import { useQuery } from 'react-query';
 
@@ -49,6 +48,3 @@ const EditorList: React.FC<EditorListProps> = ({ className, isLog, token }) => {
 };
 
 export default EditorList;
-=======
-import React from "react";
->>>>>>> b00baec9 (feat : add HeaderNavigation component)