diff --git a/admin/appmarket/template/cloudappmarket.htm b/admin/appmarket/template/cloudappmarket.htm
index b01df40..317d0a1 100644
--- a/admin/appmarket/template/cloudappmarket.htm
+++ b/admin/appmarket/template/cloudappmarket.htm
@@ -9,7 +9,7 @@
 	border-bottom: 1px solid #f2f2f2;
 	position: relative;
 	display: flex;
-    align-items: center;
+  align-items: center;
 }
 .app_upgradelist .progess {
 	position: absolute;
diff --git a/admin/system/template/xtxx.htm b/admin/system/template/xtxx.htm
index e4f30a8..a77e769 100644
--- a/admin/system/template/xtxx.htm
+++ b/admin/system/template/xtxx.htm
@@ -25,7 +25,7 @@
 	<div class="left-drager">
 	</div>
 	<div class="bs-main-container  clearfix">
-		<div class="main-content" style="padding:20px 0;border-top:1px solid #FFF">
+		<div class="main-content">
 			<div class="well well-sm">
 				<div class="container step_1">
 					<h2 class="title">版本信息</h2>
diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm
index 94a7d8c..7a8ffd5 100644
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -171,8 +171,4 @@
 	<!--{template common/footer}-->
 <!--{else}-->
 	<!--{template common/footer_ajax}-->
-<<<<<<< HEAD
 <!--{/if}-->
-=======
-<!--{/if}-->
->>>>>>> ea30bc60ea27a7f1ef0fa26c90af2abdd1ee14d9
diff --git a/static/css/app_manage.css b/static/css/app_manage.css
index 6abeb90..961b38e 100644
--- a/static/css/app_manage.css
+++ b/static/css/app_manage.css
@@ -555,8 +555,7 @@ button.input-search-drop {
 }
 
 .note.u-bottom,.dateline.u-bottom {
-  margin-bottom: 0;
-  padding-bottom: 0;
+  margin:0;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: normal;