diff --git a/views/index.html b/views/index.html
index cdc340a..32263ec 100644
--- a/views/index.html
+++ b/views/index.html
@@ -216,8 +216,12 @@ pre {
 
 <section class='container'>
           <hgroup>
+<<<<<<< HEAD
             <h1>Welcome to your Node.js application on OpenShift. Dis gon be gud, very nice as well.</h1>
             <h4>Strap yourself in for this wild ride.</h4>
+=======
+            <h1>Welcome to your Node.js application on OpenShift. Dis gon be gud</h1>
+>>>>>>> 708d2532b2ba8d59003151829cafe15cfd5587e6
           </hgroup>