diff --git a/web/src/components/player/dynamic/DynamicVideoPlayer.tsx b/web/src/components/player/dynamic/DynamicVideoPlayer.tsx
index 3c20a8b30..450dd1a17 100644
--- a/web/src/components/player/dynamic/DynamicVideoPlayer.tsx
+++ b/web/src/components/player/dynamic/DynamicVideoPlayer.tsx
@@ -198,25 +198,10 @@ export default function DynamicVideoPlayer({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [controller, recordings]);
 
-<<<<<<< Updated upstream
-  /** the HLS endpoint returns the vod segments with the first
-   * segment of the hour trimmed, meaning it will start at
-   * the beginning of the hour, cutting off any difference
-   * that the segment has.
-   */
-  const inpointOffset = useMemo(() => {
-    if (!recordingParams || !recordings || recordings?.length === 0) {
-      return 0;
-    }
-
-    return recordingParams.after - recordings[0].start_time;
-  }, [recordingParams, recordings]);
-=======
   const inpointOffset = useMemo(
     () => calculateInpointOffset(recordingParams.after, (recordings || [])[0]),
     [recordingParams, recordings],
   );
->>>>>>> Stashed changes
 
   return (
     <>