diff --git a/.storybook/stories/storybook-entities.tsx b/.storybook/stories/storybook-entities.tsx
index cd51e9ca..b267109a 100644
--- a/.storybook/stories/storybook-entities.tsx
+++ b/.storybook/stories/storybook-entities.tsx
@@ -27,13 +27,8 @@ export const getStoryBookImage = (imageUrl?: string): MediaImage => {
       width: 1500,
       alt: "Placeholder Image",
       size: 123,
-<<<<<<< HEAD
-      focalX: 50,
-      focalY: 50
-=======
       focalY: 50,
       focalX: 50,
->>>>>>> 1.x
     }
   }
 }