diff --git a/backend/main.py b/backend/main.py
index e52812b..6316a86 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -1,9 +1,6 @@
-<<<<<<< HEAD
 #!/usr/bin/env python3
 
 import os
-=======
->>>>>>> ea21db141a6e6289f7763c3cee85f465519abea7
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
@@ -17,11 +14,8 @@ import routers.exercises
 import routers.metrics
 import routers.sync
 
-<<<<<<< HEAD
 # Гарантируем, что директория существует
 os.makedirs(os.path.dirname(os.getenv("GYM_DB_PATH", "./gym.db")), exist_ok=True)
-=======
->>>>>>> ea21db141a6e6289f7763c3cee85f465519abea7
 
 Base.metadata.create_all(bind=engine)
 
diff --git a/frontend/js/app.js b/frontend/js/app.js
index d30456e..1cc0241 100644
--- a/frontend/js/app.js
+++ b/frontend/js/app.js
@@ -24,7 +24,7 @@ function renderHeader() {
     const modeLabel = state.mode === 'trainer' ? '👨‍🏫 Тренер' : '👤 Личный';
     document.getElementById('app-header').innerHTML = `
         <div>
-            <h2>Gym Bro <span style="font-size:0.8rem; color:var(--text-secondary); font-weight:400;">(${modeLabel})</span></h2>
+            <h2>Gym Bro 😈 <span style="font-size:0.8rem; color:var(--text-secondary); font-weight:400;">(${modeLabel})</span></h2>
             <div id="sync-status" class="sync-status">● Локально</div>
         </div>
         <div class="header-actions">