Fix conflicts

package.json

@@ -50,12 +50,7 @@
   "dependencies": {
     "@elastic/datemath": "^5.0.3",
     "@elastic/ems-client": "8.5.3",
-<<<<<<< HEAD
-    "@elastic/eui": "^98.0.0",
-=======
-    "@elastic/eui": "98.2.1-borealis.0",
-    "@elastic/eui-theme-borealis": "^0.0.6",
->>>>>>> f39c3ee (fix(deps): update elastic eui (#1387))
+    "@elastic/eui": "98.2.1",
     "@emotion/css": "^11.10.6",
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
     "@turf/bbox": "7.1.0",

yarn.lock

@@ -1536,33 +1536,11 @@
     semver "^7.6.2"
     topojson-client "^3.1.0"
 
-<<<<<<< HEAD
-"@elastic/eui@^98.0.0":
-  version "98.1.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-98.1.0.tgz#1538dc8c23590805fadf6b986a14ecafc3a1108e"
-  integrity sha512-zBfZpiDMN4kdVvo1icD0qzJ7FehDoLJcgt/2ulMqNTVXLnhD6sFWGiuDwHDEW2VqEUslUXVwfQfsWuLowqNWWg==
-  dependencies:
-=======
-"@elastic/eui-theme-borealis@^0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/@elastic/eui-theme-borealis/-/eui-theme-borealis-0.0.6.tgz#4ade71ed1a9e771ac22d618b34d8fd89ee64ba37"
-  integrity sha512-tG9SN1MyWcHVOowdY16qZ2R+k5OeBfgUUzQM0rIZdx5ZmGRoGAY8Jr3eUovPNW0znkQA31DcQyrNbrD921xHgg==
-
-"@elastic/eui-theme-common@0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@elastic/eui-theme-common/-/eui-theme-common-0.0.5.tgz#e808f2d93fd51042f225584e6dc051a5da98b955"
-  integrity sha512-Xp6zuJ9Pqd2LnAOP6FwJ81xUml01UotKLdLvNEFM8XvbWfJOPfMWqzIgrttpbio44jyuEmJ/t+UcfLsiOAGsPA==
+"@elastic/eui@98.2.1":
+  version "98.2.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-98.2.1.tgz#d40bfc7b06ad4a964e3c0a192d90614cbcdee0ed"
+  integrity sha512-I1C2okBDVlcmSJAgGX4E1N7fBIJPdG9/8Am7S/aJsd4LlB2MnWN47M6SdSH9BJQpVeLKSHyiVCQl4pKwXxOB5w==
   dependencies:
-    "@types/lodash" "^4.14.202"
-    lodash "^4.17.21"
-
-"@elastic/eui@98.2.1-borealis.0":
-  version "98.2.1-borealis.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-98.2.1-borealis.0.tgz#e613f0917989561395cc4a9c8206245eac618c1a"
-  integrity sha512-qZBPMfdBcXITGYuwy5OAo5FU2+eKMrZYsxs2hBQFZOUlLL4VLJ6SzgwAzJZx7BJWBTJSDtv8+PhPgNk/3FSMJg==
-  dependencies:
-    "@elastic/eui-theme-common" "0.0.5"
->>>>>>> f39c3ee (fix(deps): update elastic eui (#1387))
     "@hello-pangea/dnd" "^16.6.0"
     "@types/lodash" "^4.14.202"
     "@types/numeral" "^2.0.5"