resolve merge conflicts in template.js

customize.dist/pages.js

@@ -285,6 +285,10 @@ define([
         return h('div#container');
     };
 
+    Pages['/profile/'] = Pages['/profile/index.html'] = function () {
+        return h('div#container');
+    };
+
     Pages['/register/'] = Pages['/register/index.html'] = function () {
         return [h('div#main', [
             h('div.mainOverlay'),

customize.dist/template.js

@@ -136,6 +136,8 @@ $(function () {
 
         if (/^\/settings\//.test(pathname)) {
             require([ '/settings/main.js', ], function () {});
+        } else if (/^\/profile\//.test(pathname)) {
+            require([ '/profile/main.js'], function () {});
         } else if (/^\/user\//.test(pathname)) {
             require([ '/user/main.js'], function () {});
         } else if (/^\/register\//.test(pathname)) {
@@ -149,6 +151,5 @@ $(function () {
             require([ '/customize/main.js', ], function () {});
         }
     });
-
 });
 });