diff --git a/Procfile b/Procfile
index ff32438..02dab60 100644
--- a/Procfile
+++ b/Procfile
@@ -1,9 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 python WIPBOT.py
-=======
-python3 WIPBOT.py
->>>>>>> 8839ffd (first commit of Discord bot)
-=======
-python WIPBOT.py
->>>>>>> 462e052 (Salvando alterações locais antes de rebase)