diff --git a/packages/svelte/src/internal/client/reactivity/computations.js b/packages/svelte/src/internal/client/reactivity/computations.js
index 9ae74cc731..30ec4fcb69 100644
--- a/packages/svelte/src/internal/client/reactivity/computations.js
+++ b/packages/svelte/src/internal/client/reactivity/computations.js
@@ -1,17 +1,5 @@
 import { DEV } from 'esm-env';
 import {
-<<<<<<< HEAD
-	CLEAN,
-	DERIVED,
-	DIRTY,
-	EFFECT,
-	MANAGED,
-	PRE_EFFECT,
-	RENDER_EFFECT,
-	UNINITIALIZED,
-	UNOWNED,
-=======
->>>>>>> main
 	current_block,
 	current_component_context,
 	current_consumer,
@@ -21,9 +9,7 @@ import {
 	schedule_effect
 } from '../runtime.js';
 import { default_equals, safe_equal } from './equality.js';
-<<<<<<< HEAD
 import { remove } from '../reconciler.js';
-=======
 import {
 	DIRTY,
 	MANAGED,
@@ -35,7 +21,6 @@ import {
 	CLEAN,
 	UNINITIALIZED
 } from '../constants.js';
->>>>>>> main
 
 /**
  * @template V