diff --git a/.changeset/olive-bears-relate.md b/.changeset/olive-bears-relate.md
deleted file mode 100644
index cacd7123..00000000
--- a/.changeset/olive-bears-relate.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-'focus-trap-react': minor
----
-
-<<<<<<< HEAD
-Bumps focus-trap to v6.8.0. The big new feature is opt-in Shadow DOM support in focus-trap (in tabbable), and a new `getShadowRoot` tabbable option exposed in a new `focusTrapOptions.tabbableOptions` configuration option.
-=======
-Bumps focus-trap to v6.8.1. The big new feature is opt-in Shadow DOM support in focus-trap (in tabbable), and new tabbable options exposed in a new `focusTrapOptions.tabbableOptions` configuration option.
->>>>>>> 57d9caa (Add shadow DOM support with ft v6.8.1)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 702b8409..0b0fac6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 8.10.0
+
+### Minor Changes
+
+- 659d44e: Bumps focus-trap to v6.8.1. The big new feature is opt-in Shadow DOM support in focus-trap (in tabbable), and new tabbable options exposed in a new `focusTrapOptions.tabbableOptions` configuration option.
+
 ## 8.9.2
 
 ### Patch Changes
diff --git a/package.json b/package.json
index 829da801..04b72410 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "focus-trap-react",
-  "version": "8.9.2",
+  "version": "8.10.0",
   "description": "A React component that traps focus.",
   "main": "dist/focus-trap-react.js",
   "types": "index.d.ts",