3 files changed, 0 insertions, 55 deletions
diff --git a/src/frontend/app/components/StopAlert.tsx b/src/frontend/app/components/StopAlert.tsx
index f1356e6..1cbbd75 100644
--- a/src/frontend/app/components/StopAlert.tsx
+++ b/src/frontend/app/components/StopAlert.tsx
@@ -31,30 +31,11 @@ export const StopAlert: React.FC<StopAlertProps> = ({
   }, [stop.alert]);
 
   return (
-<<<<<<< HEAD
     <div className={`stop-alert ${alertType} ${compact ? 'stop-alert-compact' : ''}`}>
       {alertIcon}
       <div className="stop-alert-content">
         {stop.title && <div className="stop-alert-title">{stop.title}</div>}
         {stop.message && <div className="stop-alert-message">{stop.message}</div>}
-=======
-    <div
-      className={`stop-alert ${isError ? "stop-alert-error" : "stop-alert-info"} ${compact ? "stop-alert-compact" : ""}`}
-    >
-      <div className="stop-alert-icon">
-        {isError ? <AlertCircle /> : <Info />}
-      </div>
-      <div className="stop-alert-content">
-        {stop.title && <div className="stop-alert-title">{stop.title}</div>}
-        {stop.message && (
-          <div className="stop-alert-message">{stop.message}</div>
-        )}
-        {stop.alternateCodes && stop.alternateCodes.length > 0 && (
-          <div className="stop-alert-alternate-codes">
-            Alternative stops: {stop.alternateCodes.join(", ")}
-          </div>
-        )}
->>>>>>> 88e0621 (Improve gallery scroll indicators and format code)
       </div>
     </div>
   );
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;
diff --git a/src/frontend/app/components/StopSheetSkeleton.tsx b/src/frontend/app/components/StopSheetSkeleton.tsx
index 36ce546..0ae83b8 100644
--- a/src/frontend/app/components/StopSheetSkeleton.tsx
+++ b/src/frontend/app/components/StopSheetSkeleton.tsx
@@ -59,22 +59,11 @@ export const StopSheetSkeleton: React.FC<StopSheetSkeletonProps> = ({
             <Skeleton width="70px" height="0.85rem" />
           </div>
 
-<<<<<<< HEAD
           <div className="stop-sheet-view-all" style={{
             background: "var(--service-background)",
             cursor: "not-allowed",
             pointerEvents: "none"
           }}>
-=======
-          <div
-            className="stop-sheet-view-all"
-            style={{
-              background: "#f0f0f0",
-              cursor: "not-allowed",
-              pointerEvents: "none",
-            }}
-          >
->>>>>>> 88e0621 (Improve gallery scroll indicators and format code)
             <Skeleton width="180px" height="0.85rem" />
           </div>
         </div>