diff --git a/index.js b/index.js
index 0a37a74..c600667 100644
--- a/index.js
+++ b/index.js
@@ -5,26 +5,6 @@ app.config = {
   pagePath: __dirname + "\\src\\pages",
 };
 
-<<<<<<< HEAD
-  "templatePath":__dirname+"\\src\\templates",
-  "pagePath":__dirname+"\\src\\pages"
-  
-  };
-
 app.render = engine.render;
 
-// app.getTemplateNameFromPage = function(pageName)
-// {
-//   return app.pages.get(pageName)["_TEMPLATE_"]
-// }
-
-=======
-app.render = engine.render;
->>>>>>> 15070407cefad5bcf866cedb53b9e41d47333d9b
-
-// app.getTemplateNameFromPage = function(pageName)
-// {
-//   return app.pages.get(pageName)["_TEMPLATE_"]
-// }
-
 module.exports = app;