diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss
index 1b18804e601..09732f98a99 100644
--- a/frappe/public/scss/desk/report.scss
+++ b/frappe/public/scss/desk/report.scss
@@ -103,12 +103,8 @@
 }
 
 .group-by-button.btn-primary-light {
-<<<<<<< HEAD
-	color: var(--blue-500);
-=======
 	color: var(--text-on-blue);
 	outline: 1px solid var(--bg-dark-blue);
->>>>>>> 85145c2c11 (fix: styling of group by button)
 }
 
 .group-by-icon.active {