diff --git a/lib/method.js b/lib/method.js
index ac627bf..608b69a 100644
--- a/lib/method.js
+++ b/lib/method.js
@@ -666,11 +666,7 @@ function method (web) {
     var ext = self.set('view engine') || 'jade';
     var engine = require(ext);
     var root = self.set('views');
-<<<<<<< HEAD
     var render = EventProxy.create();
-=======
-    var render = new EventProxy();
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
     if (!/\/$/i.test(root)) root += '/';
     render.all('layout', 'body', function (layout, body) {
       layout_view.body = body;
@@ -681,11 +677,7 @@ function method (web) {
     });
     if (opt.layout !== false) {
       if (opt.layout === undefined || opt.layout === true) {
-<<<<<<< HEAD
         fs.readFile(root + 'layout.' + ext, 'utf-8', function (err, layout) {
-=======
-        fs.readFile(root + 'layout.' + ext, function (err, layout) {
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
           if (err) return render.trigger('layout', '#{body}');
           render.trigger('layout', layout.toString());
         });
@@ -722,8 +714,4 @@ function method (web) {
     web[middlewares[i]] = connect[middlewares[i]];
   }
 }
-<<<<<<< HEAD
-module.exports.ext = method;
-=======
-module.exports.ext = method;
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
+module.exports.ext = method;
\ No newline at end of file