From 4dffbf3bcb4155c20e32a6ac3e482664ac3ddf20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Mon, 4 Nov 2024 15:06:32 +0100
Subject: [PATCH] resolve merge conflict

---
 .../examples/ufm-custom-component/index.ts                      | 1 +
 .../tiptap/extensions/toolbar/clear-formatting.extension.ts     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts b/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts
index af49cdc0f3..67d3281921 100644
--- a/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts
+++ b/src/Umbraco.Web.UI.Client/examples/ufm-custom-component/index.ts
@@ -8,6 +8,7 @@ export const manifests: Array<ManifestUfmComponent> = [
 		api: () => import('./custom-ufm-component.js'),
 		meta: {
 			marker: '%',
+			alias: 'myCustomComponent',
 		},
 	},
 ];
diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/clear-formatting.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/clear-formatting.extension.ts
index 159e932a14..2541a24615 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/clear-formatting.extension.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/tiptap/extensions/toolbar/clear-formatting.extension.ts
@@ -1,4 +1,4 @@
-import { UmbTiptapToolbarElementApiBase } from '../types.js';
+import { UmbTiptapToolbarElementApiBase } from '../base.js';
 import type { Editor } from '@umbraco-cms/backoffice/external/tiptap';
 
 export default class UmbTiptapToolbarClearFormattingExtensionApi extends UmbTiptapToolbarElementApiBase {