diff --git a/app.js b/app.js
index b0e465b..16d9ad4 100644
--- a/app.js
+++ b/app.js
@@ -24,10 +24,7 @@ const pool = mariadb.createPool({
     db
 });
 
-<<<<<<< HEAD
-=======
 console.log(dbip + " is our database");
->>>>>>> dcf022ea688e7bc79b407fd4e8e5ceb9644dcbca
 
 //Initialize pollrate variable
 let pollrate = "5000"; // 5 Seconds