fix: merge conflicts

services/frontend/src/App.tsx

@@ -2,7 +2,7 @@ import { Routes, Route } from "react-router";
 import "./styles/globals.css";
 import Competitions from "./pages/Competitions";
 import CompetitionPreview from './pages/CompetitionPreview'
-import CompetitionSession from "./pages/CompetitionSesssion";
+import CompetitionSession from "./pages/CompetitionSession";
 import { NavbarLayout } from "./widgets/navbar-layout";
 
 const App = () => {

services/frontend/src/pages/CompetitionSession/index.tsx

@@ -40,16 +40,18 @@ const CompetitionSessionPage = () => {
   };
 
   return (
-    <>      
+    <>
       <div className="sticky top-0 z-10 bg-white">
-        <div className="max-w-6xl mx-auto px-4">
+        <div className="mx-auto max-w-6xl px-4">
           <div className="py-3 text-center">
-            <h1 className="text-lg font-semibold font-hse-sans">{competitionTitle}</h1>
+            <h1 className="font-hse-sans text-lg font-semibold">
+              {competitionTitle}
+            </h1>
           </div>
           
           <div className="flex items-center justify-center gap-2 pb-3 overflow-x-auto no-scrollbar">
             {tasks.map((task) => (
-              <div 
+              <div
                 key={task.id}
                 className={`${getTaskBgColor(task.status)} ${getTaskTextColor(task.status)} 
                   rounded-lg px-3 py-1.5 font-medium text-sm font-hse-sans cursor-pointer 

services/frontend/src/pages/CompetitionSession/utils/utils.ts

@@ -1,5 +1,4 @@
-import { TaskStatus } from "@/shared/types/types";
-
+import { TaskStatus } from "@/shared/types";
 const getTaskBgColor = (status: TaskStatus): string => {
   switch (status) {
     case "uncleared": return "bg-[var(--color-task-uncleared)]";