diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less
index 151286d9f8..75d9525040 100644
--- a/awx/ui/client/src/dashboard/dashboard.block.less
+++ b/awx/ui/client/src/dashboard/dashboard.block.less
@@ -1,5 +1,4 @@
 /** @define Dashboard */
-<<<<<<< HEAD
 @import "../shared/branding/colors.default.less";
 
 .Dashboard {