diff --git a/app.js b/app.js
index 541532ebe..71d4cb7cf 100644
--- a/app.js
+++ b/app.js
@@ -2,7 +2,11 @@ const express = require('express');
 const app = express();
 const port = 8080;
 
-app.get('/', (req, res) => res.send('Hello World!'));
+<<<<<<< HEAD
+app.get('/', (req, res) => res.send('You have power over your mind — not outside events!'));
+=======
+app.get('/', (req, res) => res.send('Hellow World!'));
+>>>>>>> 3aab40564023394622b363031e802bedbfaf8297
 
 app.listen(port);
 console.log(`App running on http://localhost:${port}`);