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