diff --git a/univcloud/static/css/style.css b/univcloud/static/css/style.css
index 258722b..b616d68 100644
--- a/univcloud/static/css/style.css
+++ b/univcloud/static/css/style.css
@@ -258,7 +258,6 @@ li.dark-bg:hover .close {
   width: 6em;
 }
 
-<<<<<<< HEAD
 #map-and-idplist {
   height: 700px;
 }