diff --git a/src/components/map/MapView.svelte b/src/components/map/MapView.svelte
index 2db8435..d49bce4 100644
--- a/src/components/map/MapView.svelte
+++ b/src/components/map/MapView.svelte
@@ -20,10 +20,8 @@
 	export let showRouteMap = false;
 	export let stop = null;
 	export let mapProvider = null;
-<<<<<<< HEAD
-=======
+
 	let isTripPlanMoodActive = false;
->>>>>>> b21eed0 (feat: implement trip planner mood toggle in MapView component)
 
 	let selectedStopID = null;
 	let mapInstance = null;