diff --git a/public/components/report_definitions/report_settings/report_settings.tsx b/public/components/report_definitions/report_settings/report_settings.tsx
index 2b5f5a55..4f008d07 100644
--- a/public/components/report_definitions/report_settings/report_settings.tsx
+++ b/public/components/report_definitions/report_settings/report_settings.tsx
@@ -6,12 +6,8 @@
 import React, { useEffect, useState } from 'react';
 import { i18n } from '@osd/i18n';
 import {
-<<<<<<< HEAD
   EuiFieldText,
-=======
   EuiFieldNumber,
-  EuiCompressedFieldText,
->>>>>>> d4f95c90 ([Feature] Add the ability to configure record limit/count from the UI (#395))
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
@@ -20,24 +16,13 @@ import {
   EuiPageContent,
   EuiPageContentBody,
   EuiHorizontalRule,
-  EuiText,
   EuiSpacer,
-<<<<<<< HEAD
   EuiRadioGroup,
-  EuiSelect,
   EuiTextArea,
   EuiCheckboxGroup,
   EuiComboBox,
-=======
-  EuiCompressedRadioGroup,
-  EuiCompressedTextArea,
-  EuiCompressedCheckboxGroup,
-  EuiCompressedComboBox,
-  EuiFormRow,
-  OuiCallOut,
   EuiText,
   EuiIcon,
->>>>>>> d4f95c90 ([Feature] Add the ability to configure record limit/count from the UI (#395))
 } from '@elastic/eui';
 import {
   REPORT_SOURCE_RADIOS,