diff --git a/.env.example b/.env.example
index c00f5b8..401271a 100644
--- a/.env.example
+++ b/.env.example
@@ -3,7 +3,4 @@ MONGOURI=
 DEV=
 CLIENTID=
 GUILDID=
-HYPIXELAPIKEY=
-GUILDINFO=
-REQUIREMENTS=
-RULESINFO=
\ No newline at end of file
+HYPIXELAPIKEY=
\ No newline at end of file
diff --git a/index.js b/index.js
index 0bba40c..398a289 100644
--- a/index.js
+++ b/index.js
@@ -7,7 +7,10 @@ const mongoURI = process.env.MONGOURI;
 const {connect} = require('mongoose');
 const path = require('path');
 const fs = require('fs');
+<<<<<<< HEAD
 const {parseArgs} = require('util');
+=======
+>>>>>>> ce5f0e69a420358f6ba11e9ad1dfa82c25e5ca90
 
 const client = new Client({
   intents : [
@@ -228,4 +231,10 @@ client.on(Events.ClientReady, () => {
 client.on(Events.ClientReady, () => { client.user.setStatus('dnd'); });
 client.login(token);
 
+<<<<<<< HEAD
 connect(mongoURI, {}).then(() => { console.log('Connected to MongoDB'); })
+=======
+connect(mongoURI, {}).then(() => {
+    console.log('Connected to MongoDB');
+})
+>>>>>>> ce5f0e69a420358f6ba11e9ad1dfa82c25e5ca90