diff --git a/change/@fluentui-react-next-2020-09-17-10-37-30-combobox-merge.json b/change/@fluentui-react-next-2020-09-17-10-37-30-combobox-merge.json
new file mode 100644
index 00000000000000..62dfc5c87c14ba
--- /dev/null
+++ b/change/@fluentui-react-next-2020-09-17-10-37-30-combobox-merge.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Fix implicit merge conflict in ComboBox",
+  "packageName": "@fluentui/react-next",
+  "email": "elcraig@microsoft.com",
+  "dependentChangeType": "patch",
+  "date": "2020-09-17T17:37:30.008Z"
+}
diff --git a/packages/react-next/src/components/ComboBox/ComboBox.tsx b/packages/react-next/src/components/ComboBox/ComboBox.tsx
index 422aed5b6bd22c..b9dafc4961cc90 100644
--- a/packages/react-next/src/components/ComboBox/ComboBox.tsx
+++ b/packages/react-next/src/components/ComboBox/ComboBox.tsx
@@ -20,7 +20,7 @@ import {
   EventGroup,
 } from '../../Utilities';
 import { Callout } from '../../Callout';
-import { Checkbox } from '../../compat/Checkbox';
+import { Checkbox } from '../../Checkbox';
 import { DirectionalHint } from '../../common/DirectionalHint';
 import { getCaretDownButtonStyles, getOptionStyles, getStyles } from './ComboBox.styles';
 import { getClassNames, getComboBoxOptionClassNames, IComboBoxClassNames } from './ComboBox.classNames';