diff --git a/Procfile b/Procfile
index 02dab60..41d210f 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1,5 @@
+<<<<<<< HEAD
 python WIPBOT.py
+=======
+python3 WIPBOT.py
+>>>>>>> 8839ffd (first commit of Discord bot)
diff --git a/WIPBOT.py b/WIPBOT.py
index 833755e..c63597b 100644
--- a/WIPBOT.py
+++ b/WIPBOT.py
@@ -285,7 +285,15 @@ async def on_raw_reaction_remove(payload):
         await mensagem.edit(embed=format_grupo_embed())
         if role in CLASSES_POR_ROLE:
             await channel.send(f"{member.mention}, escolhe a tua classe:", view=ClasseView(role, nome))
+<<<<<<< HEAD
         if (len(inscritos["Tank"]) == LIMITES["Tank"] and len(inscritos["Healer"]) == LIMITES["Healer"] and len(inscritos["DPS"]) == LIMITES["DPS"]):
+=======
+        if (
+            len(inscritos["Tank"]) == LIMITES["Tank"] and
+            len(inscritos["Healer"]) == LIMITES["Healer"] and
+            len(inscritos["DPS"]) == LIMITES["DPS"]
+        ):
+>>>>>>> 8839ffd (first commit of Discord bot)
             await channel.send("🎉 Dungeon Encerrada! Parabéns <@Rixa>, felicidades 🎉")
 
 @bot.event