1 files changed, 0 insertions, 25 deletions
diff --git a/src/frontend/app/components/StopItemSkeleton.tsx b/src/frontend/app/components/StopItemSkeleton.tsx
index 76559de..2791bdc 100644
--- a/src/frontend/app/components/StopItemSkeleton.tsx
+++ b/src/frontend/app/components/StopItemSkeleton.tsx
@@ -11,7 +11,6 @@ const StopItemSkeleton: React.FC<StopItemSkeletonProps> = ({
   showId = false,
   stopId,
 }) => {
-<<<<<<< HEAD
     return (
         <SkeletonTheme baseColor="var(--skeleton-base)" highlightColor="var(--skeleton-highlight)">
             <li className="list-item">
@@ -38,30 +37,6 @@ const StopItemSkeleton: React.FC<StopItemSkeletonProps> = ({
             </li>
         </SkeletonTheme>
     );
-=======
-  return (
-    <SkeletonTheme baseColor="#f0f0f0" highlightColor="#e0e0e0">
-      <li className="list-item">
-        <div className="list-item-link">
-          <span>{showId && stopId && <>({stopId}) </>}</span>
-          <Skeleton
-            width={showId ? "60%" : "80%"}
-            style={{ display: "inline-block" }}
-          />
-          <div className="line-icons" style={{ marginTop: "4px" }}>
-            <Skeleton
-              count={3}
-              width="30px"
-              height="20px"
-              inline={true}
-              style={{ marginRight: "0.5rem" }}
-            />
-          </div>
-        </div>
-      </li>
-    </SkeletonTheme>
-  );
->>>>>>> 88e0621 (Improve gallery scroll indicators and format code)
 };
 
 export default StopItemSkeleton;