diff --git a/admin/appmarket/template/cloudappmarket.htm b/admin/appmarket/template/cloudappmarket.htm
index ba41048..b01df40 100644
--- a/admin/appmarket/template/cloudappmarket.htm
+++ b/admin/appmarket/template/cloudappmarket.htm
@@ -8,6 +8,8 @@
 	padding: 8px;
 	border-bottom: 1px solid #f2f2f2;
 	position: relative;
+	display: flex;
+    align-items: center;
 }
 .app_upgradelist .progess {
 	position: absolute;
diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm
index 7a8ffd5..94a7d8c 100644
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -171,4 +171,8 @@
 	<!--{template common/footer}-->
 <!--{else}-->
 	<!--{template common/footer_ajax}-->
+<<<<<<< HEAD
 <!--{/if}-->
+=======
+<!--{/if}-->
+>>>>>>> ea30bc60ea27a7f1ef0fa26c90af2abdd1ee14d9