diff --git a/res/css/_common.pcss b/res/css/_common.pcss
index e3449f4bce..75180013f6 100644
--- a/res/css/_common.pcss
+++ b/res/css/_common.pcss
@@ -636,12 +636,8 @@ legend {
     button:not(
         .mx_Dialog_nonDialogButton,
         [class|="maplibregl"],
-<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
-=======
-        .mx_AccessibleButton .mx_UserProfileSettings button,
->>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
@@ -658,12 +654,8 @@ legend {
 .mx_Dialog_buttons
     button:not(
         .mx_Dialog_nonDialogButton,
-<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
-=======
-        .mx_AccessibleButton .mx_UserProfileSettings button,
->>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
@@ -681,12 +673,8 @@ legend {
 .mx_Dialog_buttons
     button.danger:not(
         .mx_Dialog_nonDialogButton,
-<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
-=======
-        .mx_AccessibleButton .mx_UserProfileSettings button,
->>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,
@@ -708,12 +696,8 @@ legend {
     button:not(
         .mx_Dialog_nonDialogButton,
         [class|="maplibregl"],
-<<<<<<< HEAD
         .mx_AccessibleButton,
         .mx_UserProfileSettings button,
-=======
-        .mx_AccessibleButton .mx_UserProfileSettings button,
->>>>>>> 5ed4e100ca (Reformat other :not sections)
         .mx_ThemeChoicePanel_CustomTheme button,
         .mx_UnpinAllDialog button,
         .mx_ShareDialog button,