diff --git a/src/Settings.hs b/src/Settings.hs
index 650ed85f4..1894d0f03 100644
--- a/src/Settings.hs
+++ b/src/Settings.hs
@@ -452,14 +452,9 @@ data AppSettings = AppSettings
     , appDatabaseConf           :: PostgresConf
     -- ^ Configuration settings for accessing the database.
     , appAutoDbMigrate          :: Bool
-<<<<<<< HEAD
-    , appUserAuthConf           :: UserAuthConf -- TODO: add SSO option for user-auth config
-=======
+    , appUserAuthConf           :: UserAuthConf
     , appSingleSignOn           :: Bool
     -- ^ Enable OIDC single sign-on
-    , appLdapConf               :: Maybe (PointedList LdapConf)
-    -- ^ Configuration settings for CSV export/import to LMS (= Learn Management System)
->>>>>>> 139-single-sign-on-sso-routing-anpassen
     , appLmsConf                :: LmsConf
     -- ^ Configuration settings for CSV export/import to LMS (= Learn Management System) -- TODO, TODISCUSS: reimplement as user-auth source?
     , appAvsConf                :: Maybe AvsConf