diff --git a/lib/pages.js b/lib/pages.js
index <HASH>..<HASH> 100644
--- a/lib/pages.js
+++ b/lib/pages.js
@@ -1232,8 +1232,6 @@ module.exports = function(self) {
   // cases without crashing the site.
 
   self.callLoadersForPage = function(req, page, callback) {
-<<<<<<< HEAD
-=======
     // Useful for debugging redundant calls
     // if (page.areas) {
     //   console.log(page.type + ':' + page.slug);
@@ -1241,7 +1239,6 @@ module.exports = function(self) {
 
     self.maxLoaderRecursion = self.maxLoaderRecursion || 3;
 
->>>>>>> af96d34... maxLoaderRecursion can now be patched at the app level for performance (FG)
     if (!req.loaderRecursion) {
 
       req.loaderRecursion = {};
sigh accidentally committed a merge notice