diff --git a/css/main.css b/css/main.css
index ea80c30..0899ebe 100644
--- a/css/main.css
+++ b/css/main.css
@@ -287,7 +287,6 @@ body, html {
   background-color: #6c6;
 }
 
-<<<<<<< HEAD
 #channels ul.groupMembers
 {
   list-style: none;