diff --git a/packages/common/utils/index.ts b/packages/common/utils/index.ts
index 5697322561..83593531c7 100644
--- a/packages/common/utils/index.ts
+++ b/packages/common/utils/index.ts
@@ -630,8 +630,6 @@ export const getSystemTheme = () => {
       window.matchMedia("(prefers-color-scheme: dark)").matches
     ? ThemeKeys.DarkStr
     : ThemeKeys.BaseStr;
-<<<<<<< HEAD
-=======
 };
 
 export const getEditorTheme = (theme) => {
@@ -647,5 +645,4 @@ export const getEditorTheme = (theme) => {
     default:
       return "default-dark";
   }
->>>>>>> develop
 };