diff --git a/yarn.lock b/yarn.lock
index 55a94112f..617ebf75b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2765,11 +2765,7 @@
   dependencies:
     "@types/react" "*"
 
-<<<<<<< HEAD
-"@types/react@*", "@types/react@^18.2.39", "@types/react@^18.2.42":
-=======
 "@types/react@*", "@types/react@18.2.42", "@types/react@^18.2.42":
->>>>>>> 75ca93268 ([refactor] Editor code refactoring (#3194))
   version "18.2.42"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.42.tgz#6f6b11a904f6d96dda3c2920328a97011a00aba7"
   integrity sha512-c1zEr96MjakLYus/wPnuWDo1/zErfdU9rNsIGmE+NV71nx88FG9Ttgo5dqorXTu/LImX2f63WBP986gJkMPNbA==