diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts b/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
index 31a6c038b3..78d0311780 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/utils/selection-manager/selection.manager.ts
@@ -8,11 +8,7 @@ import { UmbArrayState, UmbBooleanState } from '@umbraco-cms/backoffice/observab
  * @export
  * @class UmbSelectionManager
  */
-<<<<<<< HEAD
-export class UmbSelectionManager<ValueType = string | null> extends UmbControllerBase {
-=======
-export class UmbSelectionManager<ValueType extends string | null = string | null> extends UmbBaseController {
->>>>>>> origin/main
+export class UmbSelectionManager<ValueType extends string | null = string | null> extends UmbControllerBase {
 	#selectable = new UmbBooleanState(false);
 	public readonly selectable = this.#selectable.asObservable();