diff --git a/jumpserver/views.py b/jumpserver/views.py
index d2446aaf8..b19e73644 100644
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -23,7 +23,6 @@ def skin_config(request):
     return render_to_response('skin_config.html')
 
 
-<<<<<<< HEAD
 def jasset_group_add(name, comment, type):
     if BisGroup.objects.filter(name=name):
         emg = u'该业务组已存在!'
@@ -64,7 +63,8 @@ def jasset_host_edit(j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment):
     a.save()
     a.bis_group = groups
     a.save()
-=======
+
+
 def login(request):
     """登录界面"""
     if request.session.get('username'):
@@ -97,5 +97,3 @@ def logout(request):
     request.session.delete()
     return HttpResponseRedirect('/login/')
 
-
->>>>>>> guanghongwei
diff --git a/templates/base.html b/templates/base.html
index 95cc04d06..729ec6fb7 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -10,6 +10,7 @@
 
     <link rel="shortcut icon" href="/static/img/facio.ico" type="image/x-icon">
     {% include 'link_css.html' %}
+    {% include 'head_script.html' %}
 
 
 </head>
@@ -27,7 +28,6 @@
         </div>
     </div>
 
-{#    <!--{% include 'script.html' %}-->#}
 </body>
-    {% include 'script.html' %}
+    {% include 'foot_script.html' %}
 </html>
diff --git a/templates/foot_script.html b/templates/foot_script.html
new file mode 100644
index 000000000..fcc41f092
--- /dev/null
+++ b/templates/foot_script.html
@@ -0,0 +1,27 @@
+<!-- Mainly scripts -->
+
+<script src="/static/js/plugins/metisMenu/jquery.metisMenu.js"></script>
+<script src="/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
+<script src="/static/js/bootstrap-dialog.js"></script>
+<script src="/static/js/mindmup-editabletable.js"></script>
+
+<!-- Custom and plugin javascript -->
+<script src="/static/js/inspinia.js"></script>
+<script src="/static/js/plugins/pace/pace.min.js"></script>
+
+<!-- iCheck box -->
+{#<script src="/static/js/plugins/iCheck/icheck.min.js"></script>#}
+
+<!-- Peity -->
+<script src="/static/js/plugins/peity/jquery.peity.min.js"></script>
+
+<!-- Peity -->
+<script src="/static/js/demo/peity-demo.js"></script>
+
+<!-- active menu -->
+<script>
+    var str = document.location.pathname.split("/")[1];
+    var str1 = document.location.pathname.split("/")[2];
+    $("#"+str).addClass('active');
+    $("#"+str1).addClass('active');
+</script>
\ No newline at end of file
diff --git a/templates/script.html b/templates/head_script.html
similarity index 59%
rename from templates/script.html
rename to templates/head_script.html
index 70edc0934..e664ddd4d 100644
--- a/templates/script.html
+++ b/templates/head_script.html
@@ -1,25 +1,6 @@
-<!-- Mainly scripts -->
 <script src="/static/js/jquery-2.1.1.js"></script>
 <script src="/static/js/bootstrap.min.js"></script>
-<script src="/static/js/plugins/metisMenu/jquery.metisMenu.js"></script>
-<script src="/static/js/plugins/slimscroll/jquery.slimscroll.min.js"></script>
-<script src="/static/js/bootstrap-dialog.js"></script>
-<script src="/static/js/mindmup-editabletable.js"></script>
 <script src="/static/js/base.js"></script>
-
-<!-- Custom and plugin javascript -->
-<script src="/static/js/inspinia.js"></script>
-<script src="/static/js/plugins/pace/pace.min.js"></script>
-
-<!-- iCheck box -->
-<script src="/static/js/plugins/iCheck/icheck.min.js"></script>
-
-<!-- Peity -->
-<script src="/static/js/plugins/peity/jquery.peity.min.js"></script>
-
-<!-- Peity -->
-<script src="/static/js/demo/peity-demo.js"></script>
-
 <script>
     $(document).ready(function(){
         $('.i-checks').iCheck({
@@ -71,11 +52,3 @@
 <!-- validator js -->
 <script src="/static/js/validator/jquery.validator.js"></script>
 <script src="/static/js/validator/zh_CN.js"></script>
-
-<!-- active menu -->
-<script>
-    var str = document.location.pathname.split("/")[1];
-    var str1 = document.location.pathname.split("/")[2];
-    $("#"+str).addClass('active');
-    $("#"+str1).addClass('active');
-</script>
\ No newline at end of file