diff --git a/groups/LimaEm/index.html b/groups/LimaEm/index.html
index c4b5d52..6664532 100644
--- a/groups/LimaEm/index.html
+++ b/groups/LimaEm/index.html
@@ -7,6 +7,7 @@
     <title>Group 07 &ndash; LIMA EM | Informatika UNTAN</title>
     <link href="./assets/css/output.css" rel="stylesheet">
     <link rel="stylesheet" href="../../assets/global/output.css">
+    <link rel="stylesheet" href="./style.css">
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link
@@ -295,33 +296,6 @@
             border-right: 1px solid #e2e8f0;
             border-bottom: 1px solid #e2e8f0;
         }
-
-        /* ===== Custom Layout Fixes (Menggantikan arbitrary Tailwind) ===== */
-        @media (min-width: 768px) {
-
-            /* Fix ukuran 2 card per baris untuk Kegiatan Unggulan */
-            .md-card-half {
-                width: calc(50% - 16px) !important;
-            }
-
-            /* Fix tinggi grid Galeri Keseruan (Tablet) */
-            .galeri-grid {
-                height: 420px !important;
-            }
-        }
-
-        @media (min-width: 1024px) {
-
-            /* Fix tinggi grid Galeri Keseruan (Desktop) */
-            .galeri-grid {
-                height: 500px !important;
-            }
-        }
-
-        /* Fix: title divisi berubah kuning saat hover */
-        #divisi .group:hover h3 {
-            color: #f5c82f !important;
-        }
     </style>
 </head>
 
@@ -1172,7 +1146,21 @@
     </div>
 
     <main id="main-content" class="min-h-screen bg-white">
+<<<<<<< HEAD
+        <div class="container mx-auto px-4 lg:px-8" style="padding-top: calc(88px + 3rem);">
+            <div class="mb-8 pb-8 border-b border-slate-200">
+                <span
+                    class="bg-untan-yellow text-slate-900 text-[10px] font-bold uppercase tracking-widest px-2 py-0.5 inline-block mb-3">Tugas
+                    Halaman Statis</span>
+                <h1 class="text-3xl lg:text-4xl font-bold text-slate-900 mb-2">Kehidupan Mahasiswa &amp; Himpunan (HMIF)
+                </h1>
+                <p class="text-slate-500 text-sm">Kelompok 07 &mdash; LIMA EM &nbsp;&middot;&nbsp; Informatika UNTAN
+                    2026</p>
+            </div>
+        </div>
+=======
 
+>>>>>>> origin/main
         <div id="assignment-body" class="w-full">
             <!-- ================= START: BAGIAN YANG DIEDIT KELOMPOK ================= -->
             <!-- Hero Section -->
@@ -1287,10 +1275,16 @@
 
                             <!-- Frame foto — overflow hidden, foto full width tanpa crop -->
                             <div
+<<<<<<< HEAD
+                                class="relative rounded-2xl lg:rounded-3xl overflow-hidden shadow-2xl z-10 group cursor-default">
+                                <img src="./assets/images/ruang-tumbuh/ruangtumbuh_foto.jpeg"
+                                    alt="Ruang Tumbuh HMIF Universitas Tanjungpura" class="w-full h-auto block
+=======
                                 class="relative rounded-2xl lg:rounded-3xl overflow-hidden shadow-2xl z-10 group cursor-default"
                                 style="height: 420px;">
                                 <img src="./assets/images/ruang-tumbuh/ruangtumbuh_foto.jpeg"
                                     alt="Ruang Tumbuh HMIF Universitas Tanjungpura" class="w-full h-full object-cover block
+>>>>>>> origin/main
                                                 transition-transform duration-700 ease-out group-hover:scale-[1.03]" />
                                 <!-- Gradient overlay bawah -->
                                 <div class="absolute inset-0
@@ -1322,7 +1316,11 @@
             </section>
 
             <!-- Partner & Kolaborator -->
+<<<<<<< HEAD
+            <section id="partners" class="bg-white py-16">
+=======
             <section id="partners" class="bg-white pb-16">
+>>>>>>> origin/main
                 <div class="max-w-7xl 2xl:max-w-[1440px] mx-auto px-6 lg:px-12">
                     <h2 data-i18n="grp_limaem_partners_title"
                         class="text-2xl lg:text-3xl font-extrabold text-gray-900 mb-10">
diff --git a/groups/LimaEm/style.css b/groups/LimaEm/style.css
index 6a695df..6a19969 100644
--- a/groups/LimaEm/style.css
+++ b/groups/LimaEm/style.css
@@ -22,7 +22,27 @@ body { font-family: "Roboto", Arial, sans-serif; color: var(--text-main); backgr
 .hero h1 { margin: 0; font-size: clamp(1.6rem, 3.2vw, 2.8rem); line-height: 1.2; }
 
 .layout { display: grid; grid-template-columns: 1fr; gap: 2rem; padding: 2rem 0 4rem; }
-@media (min-width: 1024px) { .layout { grid-template-columns: minmax(0, 3fr) minmax(260px, 1fr); } }
+@media (min-width: 1024px) { 
+    .layout { grid-template-columns: minmax(0, 3fr) minmax(260px, 1fr); } 
+    /* Fix tinggi grid Galeri Keseruan (Desktop) */
+    .galeri-grid {
+        height: 500px !important;
+    }
+}
+
+/* ===== Custom Layout Fixes (Menggantikan arbitrary Tailwind) ===== */
+@media (min-width: 768px) {
+
+    /* Fix ukuran 2 card per baris untuk Kegiatan Unggulan */
+    .md-card-half {
+        width: calc(50% - 16px) !important;
+    }
+
+    /* Fix tinggi grid Galeri Keseruan (Tablet) */
+    .galeri-grid {
+        height: 420px !important;
+    }
+}
 
 .meta { font-size: .78rem; text-transform: uppercase; color: #475569; display: flex; flex-wrap: wrap; gap: .75rem 1rem; margin-bottom: 1rem; }
 .cover { background: var(--bg-soft); border: 1px solid var(--line); margin-bottom: 1.5rem; }
@@ -68,3 +88,7 @@ body { font-family: "Roboto", Arial, sans-serif; color: var(--text-main); backgr
     width: 24px;
 }
 
+/* Fix: title divisi berubah kuning saat hover */
+#divisi .group:hover h3 {
+    color: #f5c82f !important;
+}