diff --git a/main.py b/main.py
index 3eb7df6..516fb00 100644
--- a/main.py
+++ b/main.py
@@ -364,7 +364,6 @@ async def handle_gen_mem(message: Message, bot: Bot):
 
     await message.reply_photo(BufferedInputFile(output.getvalue(), filename="meme.jpg"))
 
-<<<<<<< HEAD
 async def handle_size(message: Message):
     size = round(random.uniform(0.1, 35.0), 1)
 
@@ -385,7 +384,7 @@ async def handle_size(message: Message):
         f"📏 Твой хуек: {size} см\n"
         f"Ты: {status}"
     )
-=======
+
 KEYWORDS = {'крип', 'радиохэд', 'creep', 'radiohead'}
 # I'M CREEP
 async def handle_keywords(message: types.Message):
@@ -405,7 +404,6 @@ async def handle_keywords(message: types.Message):
             )
         else:
             logger.warning(f"Файл не найден по пути: {audio_path}")
->>>>>>> SUDOZOVCHIK-CREEP-FUNCTION
 
 
 def main():