diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
index b0db0e690bcd5..b729691831e9a 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts
@@ -29,11 +29,9 @@ import chrome from 'ui/chrome';
 export const legacyChrome = chrome;
 export { SavedObjectSaveOpts } from 'ui/saved_objects/types';
 export { npSetup, npStart } from 'ui/new_platform';
-export { IPrivate } from 'ui/private';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
 export { ConfirmationButtonTypes } from 'ui/modals/confirm_modal';
-export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 export { KbnUrl } from 'ui/url/kbn_url';
 // @ts-ignore
 export { createTopNavDirective, createTopNavHelper } from 'ui/kbn_top_nav/kbn_top_nav';
diff --git a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
index 56258c4f223eb..b0bb17ce1ac7f 100644
--- a/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
+++ b/src/legacy/core_plugins/kibana/public/discover/kibana_services.ts
@@ -54,8 +54,6 @@ export { buildVislibDimensions } from '../../../visualizations/public';
 export { getRequestInspectorStats, getResponseInspectorStats } from '../../../data/public';
 // @ts-ignore
 export { intervalOptions } from 'ui/agg_types';
-// @ts-ignore
-export { migrateLegacyQuery } from 'ui/utils/migrate_legacy_query';
 export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
index 17acae3b7cfef..d3a7f6ac1ff7d 100644
--- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
+++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts
@@ -40,9 +40,6 @@ export { stateMonitorFactory } from 'ui/state_management/state_monitor_factory';
 export { PersistedState } from 'ui/persisted_state';
 
 export { npSetup, npStart } from 'ui/new_platform';
-export { IPrivate } from 'ui/private';
-// @ts-ignore
-export { PrivateProvider } from 'ui/private/private';
 
 export { subscribeWithScope } from 'ui/utils/subscribe_with_scope';
 // @ts-ignore
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
index 52294e748782a..7292a5e975748 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.test.tsx
@@ -31,21 +31,17 @@ import { mountWithIntl as mount } from 'test_utils/enzyme_helpers';
 import { ReactWrapper } from 'enzyme';
 // eslint-disable-next-line
 import { coreMock } from '../../../../../../../../core/public/mocks';
-<<<<<<< HEAD
 // @ts-ignore
 import { findTestSubject } from '@elastic/eui/lib/test';
 
-// @ts-ignore
-function DummySavedObjectFinder(props) {
+function DummySavedObjectFinder(props: { children: React.ReactNode }) {
   return (
     <div>
       <div>Hello World</div>
       {props.children}
     </div>
-  );
+  ) as JSX.Element;
 }
-=======
->>>>>>> [Add panel flyout] Moving create new to the top of SavedObjectFinder
 
 test('createNewEmbeddable() add embeddable to container', async () => {
   const core = coreMock.createStart();
@@ -91,7 +87,6 @@ test('createNewEmbeddable() add embeddable to container', async () => {
     lastName: 'bar',
   });
 });
-<<<<<<< HEAD
 
 test('selecting embeddable in "Create new ..." list calls createNewEmbeddable()', async () => {
   const core = coreMock.createStart();
@@ -134,5 +129,3 @@ test('selecting embeddable in "Create new ..." list calls createNewEmbeddable()'
 
   expect(spy).toHaveBeenCalledTimes(1);
 });
-=======
->>>>>>> [Add panel flyout] Moving create new to the top of SavedObjectFinder
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/saved_object_finder_create_new.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/saved_object_finder_create_new.tsx
index 6a16bef6b9f98..ac39eacab287f 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/saved_object_finder_create_new.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/saved_object_finder_create_new.tsx
@@ -54,7 +54,7 @@ export function SavedObjectFinderCreateNew({ menuItems }: Props) {
       isOpen={isCreateMenuOpen}
       closePopover={closeCreateMenu}
       panelPaddingSize="none"
-      anchorPosition="upLeft"
+      anchorPosition="downRight"
     >
       <EuiContextMenuPanel items={menuItems} />
     </EuiPopover>
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/__snapshots__/saved_object_finder_create_new.test.tsx.snap b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/__snapshots__/saved_object_finder_create_new.test.tsx.snap
deleted file mode 100644
index 848f52ddfda94..0000000000000
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/__snapshots__/saved_object_finder_create_new.test.tsx.snap
+++ /dev/null
@@ -1,55 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SavedObjectFinderCreateNew renders correctly with items 1`] = `
-<EuiPopover
-  anchorPosition="upLeft"
-  button={
-    <EuiButton
-      data-test-subj="createNew"
-      fill={true}
-      iconSide="right"
-      iconType="arrowDown"
-      onClick={[Function]}
-    >
-      <FormattedMessage
-        defaultMessage="Create new"
-        id="embeddableApi.addPanel.createNewDefaultOption"
-        values={Object {}}
-      />
-    </EuiButton>
-  }
-  closePopover={[Function]}
-  display="inlineBlock"
-  hasArrow={true}
-  id="createNew"
-  isOpen={false}
-  ownFocus={false}
-  panelPaddingSize="none"
->
-  <EuiContextMenuPanel
-    hasFocus={true}
-    items={
-      Array [
-        <EuiContextMenuItem
-          data-test-subj="item1"
-          onClick={[MockFunction]}
-        >
-          item1
-        </EuiContextMenuItem>,
-        <EuiContextMenuItem
-          data-test-subj="item2"
-          onClick={[MockFunction]}
-        >
-          item2
-        </EuiContextMenuItem>,
-        <EuiContextMenuItem
-          data-test-subj="item3"
-          onClick={[MockFunction]}
-        >
-          item3
-        </EuiContextMenuItem>,
-      ]
-    }
-  />
-</EuiPopover>
-`;
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/saved_object_finder_create_new.test.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/saved_object_finder_create_new.test.tsx
index 7936076032634..6275dbd4eaa45 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/saved_object_finder_create_new.test.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/tests/saved_object_finder_create_new.test.tsx
@@ -28,8 +28,12 @@ describe('SavedObjectFinderCreateNew', () => {
     expect(wrapper.find(EuiPopover).length).toEqual(1);
     const menuPanel = wrapper.find(EuiContextMenuPanel);
     expect(menuPanel.length).toEqual(1);
-    // @ts-ignore
-    expect(menuPanel.prop('items').length).toEqual(0);
+    const panelItems = menuPanel.prop('items');
+    if (panelItems) {
+      expect(panelItems.length).toEqual(0);
+    } else {
+      fail('Expect paneltems to be defined');
+    }
   });
 
   test('renders correctly with items', () => {
@@ -46,7 +50,6 @@ describe('SavedObjectFinderCreateNew', () => {
     }
 
     const wrapper = shallow(<SavedObjectFinderCreateNew menuItems={items} />);
-    expect(wrapper).toMatchSnapshot();
     expect(wrapper.find(EuiPopover).length).toEqual(1);
     const menuPanel = wrapper.find(EuiContextMenuPanel);
     expect(menuPanel.length).toEqual(1);
diff --git a/src/plugins/saved_objects/public/finder/index.ts~HEAD b/src/plugins/saved_objects/public/finder/index.ts
similarity index 100%
rename from src/plugins/saved_objects/public/finder/index.ts~HEAD
rename to src/plugins/saved_objects/public/finder/index.ts
diff --git a/src/plugins/saved_objects/public/finder/index.ts~[NP] Move saved object modal into new platform (#56383) b/src/plugins/saved_objects/public/finder/index.ts~[NP] Move saved object modal into new platform (#56383)
deleted file mode 100644
index 54a05cdfbadc3..0000000000000
--- a/src/plugins/saved_objects/public/finder/index.ts~[NP] Move saved object modal into new platform (#56383)	
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export {
-  SavedObjectMetaData,
-  SavedObjectFinderUi,
-  getSavedObjectFinder,
-} from './saved_object_finder';
diff --git a/src/plugins/saved_objects/public/save_modal/index.ts~HEAD b/src/plugins/saved_objects/public/save_modal/index.ts
similarity index 100%
rename from src/plugins/saved_objects/public/save_modal/index.ts~HEAD
rename to src/plugins/saved_objects/public/save_modal/index.ts
diff --git a/src/plugins/saved_objects/public/save_modal/index.ts~[NP] Move saved object modal into new platform (#56383) b/src/plugins/saved_objects/public/save_modal/index.ts~[NP] Move saved object modal into new platform (#56383)
deleted file mode 100644
index f26aa732f30a1..0000000000000
--- a/src/plugins/saved_objects/public/save_modal/index.ts~[NP] Move saved object modal into new platform (#56383)	
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { SavedObjectSaveModal, OnSaveProps } from './saved_object_save_modal';
-export { showSaveModal, SaveResult } from './show_saved_object_save_modal';
diff --git a/x-pack/legacy/plugins/graph/public/legacy_imports.ts b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
index 2f0a85509c5d1..f1839d62a0667 100644
--- a/x-pack/legacy/plugins/graph/public/legacy_imports.ts
+++ b/x-pack/legacy/plugins/graph/public/legacy_imports.ts
@@ -15,7 +15,4 @@ export { confirmModalFactory } from 'ui/modals/confirm_modal';
 // @ts-ignore
 export { addAppRedirectMessageToUrl } from 'ui/notify';
 export { createSavedObjectClass } from 'ui/saved_objects/saved_object';
-<<<<<<< HEAD
 export { configureAppAngularModule } from '../../../../../src/plugins/kibana_legacy/public';
-=======
->>>>>>> [NP] Move saved object modal into new platform (#56383)