diff --git a/app/bot/dialogs/flows/events/dialogs.py b/app/bot/dialogs/flows/events/dialogs.py
index 788c86e..6a022ec 100644
--- a/app/bot/dialogs/flows/events/dialogs.py
+++ b/app/bot/dialogs/flows/events/dialogs.py
@@ -4,11 +4,7 @@ from aiogram_dialog.widgets.text import Case, Const, Format, Jinja
 
 from app.bot.dialogs.templates import event_template
 
-<<<<<<< HEAD
 from .getters import event_getter, events_list_getter, registration_getter
-=======
-from .getters import event_getter, events_list_getter
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
 from .handlers import change_registration, on_event_selected
 from .states import EventsSG
 
@@ -35,10 +31,7 @@ events_dialog = Dialog(
                 [Const("зарегистрироваться"), Const("отменить регистрацию")],
                 selector="is_registered_to_event",
             ),
-<<<<<<< HEAD
             id="change_registration_btn",
-=======
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
             on_click=change_registration,
         ),
         Back(Const("Назад")),
diff --git a/app/bot/dialogs/flows/events/getters.py b/app/bot/dialogs/flows/events/getters.py
index 8ea46cc..2505b25 100644
--- a/app/bot/dialogs/flows/events/getters.py
+++ b/app/bot/dialogs/flows/events/getters.py
@@ -5,10 +5,7 @@ from app.infrastructure.database.crud import (
     get_event_by_id,
     get_events_list,
 )
-<<<<<<< HEAD
 from app.infrastructure.database.enums import UserEventStatus
-=======
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
 from app.infrastructure.database.models import Event
 
 
diff --git a/app/bot/dialogs/flows/events/handlers.py b/app/bot/dialogs/flows/events/handlers.py
index 9b7e869..6eac0dc 100644
--- a/app/bot/dialogs/flows/events/handlers.py
+++ b/app/bot/dialogs/flows/events/handlers.py
@@ -19,7 +19,6 @@ async def on_event_selected(
     manager.dialog_data["selected_event"] = int(item_id)
     await manager.next()
 
-<<<<<<< HEAD
 
 async def change_registration(
     callback: CallbackQuery,
@@ -40,7 +39,3 @@ async def change_registration(
             await register_user_to_event(
                 manager.middleware_data["session"], user.id, event_id
             )
-=======
-async def change_registration():
-    ...
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32
diff --git a/app/infrastructure/database/crud.py b/app/infrastructure/database/crud.py
index 0b546fa..f09091d 100644
--- a/app/infrastructure/database/crud.py
+++ b/app/infrastructure/database/crud.py
@@ -104,7 +104,6 @@ async def update_event(
         event.end_date = end_date
     await session.commit()
     return event
-<<<<<<< HEAD
 
 
 async def register_user_to_event(session: AsyncSession, user_id: int, event_id: int):
@@ -134,5 +133,3 @@ async def unregister_user_to_event(session: AsyncSession, user_id: int, event_id
     ).scalar_one()
     user_event.status = UserEventStatus.CANCELLED.value
     await session.commit()
-=======
->>>>>>> 7e5939394de1e40064ccf364bcfabbbd117d5d32