diff --git a/assets/css/style.less b/assets/css/style.less
index 705a1a0..cad44cb 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -2005,11 +2005,7 @@ page {
   z-index: 5;
   top: 0;
   /* #ifdef H5 */
-<<<<<<< HEAD
-  // top: calc(44px + env(safe-area-inset-top));
-=======
   // top: calc(0 + env(safe-area-inset-top));
->>>>>>> 11d6bda8681ad955f5e73286c3478a238ee58593
   /* #endif */
 }