diff --git a/bot.py b/bot.py
index 4df7ca6..a699cc2 100644
--- a/bot.py
+++ b/bot.py
@@ -594,12 +594,7 @@ class HelpSelect(discord.ui.Select):
 
 @tree.command(name="help", description=S.CMD["help"])
 async def cmd_help(interaction: discord.Interaction):
-<<<<<<< HEAD
     is_admin = is_bot_admin(interaction.user)
-=======
-    member = interaction.user
-    is_admin = isinstance(member, discord.Member) and is_bot_admin(member)
->>>>>>> 42f7bae68124fa6a9824780ba17b46d00f3f2b36
     await interaction.response.send_message(
         embed=_help_embed("üldine"), view=HelpView(is_admin), ephemeral=True
     )
diff --git a/core/admin.py b/core/admin.py
index 8de866f..74d127f 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -6,15 +6,10 @@ from discord import app_commands
 import config
 
 
-<<<<<<< HEAD
 def is_bot_admin(member: discord.abc.User | None) -> bool:
     """True when the member has the configured admin role for their guild."""
     if not isinstance(member, discord.Member) or member.guild is None:
         return False
-=======
-def is_bot_admin(member: discord.Member) -> bool:
-    """Return True if the member has the configured bot-admin role for their guild."""
->>>>>>> 42f7bae68124fa6a9824780ba17b46d00f3f2b36
     role_id = config.BOT_ADMIN_ROLES.get(member.guild.id)
     if role_id is None:
         return False
@@ -22,22 +17,11 @@ def is_bot_admin(member: discord.Member) -> bool:
 
 
 def bot_admin_check():
-<<<<<<< HEAD
     """Slash-command decorator that gates execution behind ``is_bot_admin``."""
 
     async def predicate(interaction: discord.Interaction) -> bool:
         if is_bot_admin(interaction.user):
             return True
         raise app_commands.MissingPermissions(["bot_admin_role"])
-=======
-    """Slash-command check decorator: raises MissingPermissions if not a bot admin."""
-    def predicate(interaction: discord.Interaction) -> bool:
-        member = interaction.user
-        if not isinstance(member, discord.Member):
-            raise app_commands.MissingPermissions(["bot_admin"])
-        if not is_bot_admin(member):
-            raise app_commands.MissingPermissions(["bot_admin"])
-        return True
->>>>>>> 42f7bae68124fa6a9824780ba17b46d00f3f2b36
 
     return app_commands.check(predicate)