diff --git a/requirement.txt b/requirement.txt
index 2a79a74..c41e920 100644
--- a/requirement.txt
+++ b/requirement.txt
@@ -3,9 +3,5 @@ colorama
 qtoml
 pynacl
 python-socketio[asyncio_client]
-<<<<<<< HEAD
-mcstatus
-=======
 mcstatus
 requests
->>>>>>> 51011ec401ee07fe7446b24fad680a629e12ff56