diff --git a/qml/components/settingsPage/SettingsBehavior.qml b/qml/components/settingsPage/SettingsBehavior.qml
index 0faa786..c1d15ab 100644
--- a/qml/components/settingsPage/SettingsBehavior.qml
+++ b/qml/components/settingsPage/SettingsBehavior.qml
@@ -216,6 +216,7 @@ AccordionItem {
                     }
                 }
             }
+
                 TextSwitch {
                     checked: appSettings.notificationSuppressContent && enabled
                     text: qsTr("Hide content in notifications")
diff --git a/src/appsettings.h b/src/appsettings.h
index 77090aa..acc38b2 100644
--- a/src/appsettings.h
+++ b/src/appsettings.h
@@ -97,12 +97,9 @@ public:
     bool notificationAlwaysShowPreview() const;
     void setNotificationAlwaysShowPreview(bool enable);
 
-<<<<<<< HEAD
     bool goToQuotedMessage() const;
     void setGoToQuotedMessage(bool enable);
 
-=======
->>>>>>> b11f7dd (Always append last message content to notifications (#514))
     bool storageOptimizer() const;
     void setStorageOptimizer(bool enable);
 
@@ -142,10 +139,7 @@ signals:
     void notificationSuppressContentChanged();
     void notificationFeedbackChanged();
     void notificationAlwaysShowPreviewChanged();
-<<<<<<< HEAD
     void goToQuotedMessageChanged();
-=======
->>>>>>> b11f7dd (Always append last message content to notifications (#514))
     void storageOptimizerChanged();
     void allowInlineBotLocationAccessChanged();
     void remainingInteractionHintsChanged();