diff --git a/gerbil-manager-web/src/App.tsx b/gerbil-manager-web/src/App.tsx
index a880715..c5b2f8e 100644
--- a/gerbil-manager-web/src/App.tsx
+++ b/gerbil-manager-web/src/App.tsx
@@ -58,16 +58,13 @@ export default function App() {
           <Route path="genetik" element={<GenetikPage />} />
           <Route path="abgabe" element={<AbgabePage />} />
           <Route path="statistik" element={<StatistikPage />} />
-<<<<<<< HEAD
           <Route path="hilfe" element={<HilfePage />} />
-=======
           {/* FEAT-13: Abgabeverträge + Einstellungen (Zuchtprofil) */}
           <Route path="vertraege">
             <Route index element={<VertraegeListPage />} />
             <Route path="neu" element={<VertragWizardPage />} />
           </Route>
           <Route path="einstellungen" element={<EinstellungenPage />} />
->>>>>>> 3ec4f66 (FEAT-13: Abgabe wizard (/vertraege/neu, 4 steps, ?tiere= prefill), Vertraege list w/ download+delete, /einstellungen Zuchtprofil form, contracts/settings API clients, nav entries, detail-page entry point + replace orphaned contactInfo with email/phone/address across Kontakt pages)
           <Route path="*" element={<NotFoundPage />} />
         </Route>
       </Routes>