diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index 687e452a79..b40c25b508 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -7330,7 +7330,6 @@ tbody {
   }
   
 }
-<<<<<<< HEAD
 
 .user-group-table {
   .selected-row {
@@ -7345,5 +7344,3 @@ tbody {
     color: white !important;
   }
 }
-=======
->>>>>>> develop