diff --git a/index.html b/index.html
index acb04f0..1e78e7a 100644
--- a/index.html
+++ b/index.html
@@ -15,11 +15,6 @@
     <script type="text/javascript" src="./js/mac.js"></script>
     <link rel="stylesheet" href="./plugins/shortcut-drawer/shortcut-drawer.min.css">
     <script type="text/javascript" src="./plugins/shortcut-drawer/shortcut-drawer.min.js"></script>
-    <style>
-        * {
-            font-family: "Microsoft YaHei", 微软雅黑, "MicrosoftJhengHei", 华文细黑, STHeiti, MingLiu
-        }
-    </style>
     <script>
         Win10.onReady(function () {
 
@@ -95,14 +90,8 @@
     <div id="win10-menu" class="hidden">
 		<div class="list win10-menu-hidden animated animated-slideOutLeft">
 			<div class="item" onclick="Win10.aboutUs()"><i class="icon fa fa-star fa-fw"></i>关于</div>
-<<<<<<< HEAD
             <div class="item" onclick=" Win10.exit();"><i class="icon fa fa-power-off fa-fw"></i>关闭</div>
         </div>
-=======
-            <div class="item" onclick=" Win10.exit();"><i class="icon fa fa-window-close fa-fw"></i>关闭</div>
-        </div>
-        <div id="win10-menu-switcher"></div>
->>>>>>> 6c820125c208f963bce20f07283261761fc8e1c8
     </div>
     <div id="win10_command_center" class="hidden_right">
         <div class="title">