diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less
index 2e986fdb9f..7ee5f8bc4d 100644
--- a/awx/ui/client/src/shared/branding/colors.default.less
+++ b/awx/ui/client/src/shared/branding/colors.default.less
@@ -8,6 +8,7 @@
 @default-bg:            #FFFFFF; // also selected btn txt
 @default-secondary-bg:  #FCFCFC; // page/input field bg, just adds depth
 @default-tertiary-bg:   #FAFAFA; // hover bg, alt-list
+<<<<<<< HEAD
 @default-err:           #D9534F;
 @default-err-hov:       #C9302C;
 @default-succ:          #5CB85C;