diff --git a/resources/assets/less/metager/result.less b/resources/assets/less/metager/result.less
index c728697110ba8ba2db9bc42648c199ca53db6778..59a9279eaaa320c213a51b9a9035a2a92584c083 100644
--- a/resources/assets/less/metager/result.less
+++ b/resources/assets/less/metager/result.less
@@ -50,13 +50,8 @@
             }
         }
     }
-<<<<<<< Updated upstream
     .result-body {
-        margin-top: 20px;
-=======
-    .resultpage-body {
         margin-top: 10px;
->>>>>>> Stashed changes
         .result-description {
             margin-bottom: 3px;
             word-break: break-word;