diff --git a/contrib/quickstart/kratos/all-strategies/kratos.yml b/contrib/quickstart/kratos/all-strategies/kratos.yml
index 25bd318f9705..ee14d420b4e4 100644
--- a/contrib/quickstart/kratos/all-strategies/kratos.yml
+++ b/contrib/quickstart/kratos/all-strategies/kratos.yml
@@ -75,11 +75,7 @@ selfservice:
       lifespan: 10m
 
     registration:
-<<<<<<< Updated upstream
-      two_steps: true
-=======
       enable_legacy_flow: true
->>>>>>> Stashed changes
       lifespan: 10m
       ui_url: http://localhost:4455/registration
       after:
diff --git a/driver/config/config.go b/driver/config/config.go
index 21ce294c6190..0959144ba522 100644
--- a/driver/config/config.go
+++ b/driver/config/config.go
@@ -126,14 +126,7 @@ const (
 	ViperKeyURLsAllowedReturnToDomains                       = "selfservice.allowed_return_urls"
 	ViperKeySelfServiceRegistrationEnabled                   = "selfservice.flows.registration.enabled"
 	ViperKeySelfServiceRegistrationLoginHints                = "selfservice.flows.registration.login_hints"
-<<<<<<< Updated upstream
-	ViperKeySelfServiceRegistrationTwoSteps                  = "selfservice.flows.registration.two_steps"
-=======
-<<<<<<< Updated upstream
-=======
 	ViperKeySelfServiceRegistrationTwoSteps                  = "selfservice.flows.registration.enable_legacy_flow"
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 	ViperKeySelfServiceRegistrationUI                        = "selfservice.flows.registration.ui_url"
 	ViperKeySelfServiceRegistrationRequestLifespan           = "selfservice.flows.registration.lifespan"
 	ViperKeySelfServiceRegistrationAfter                     = "selfservice.flows.registration.after"
diff --git a/embedx/config.schema.json b/embedx/config.schema.json
index 9b0cbcd15bd4..88318449d30e 100644
--- a/embedx/config.schema.json
+++ b/embedx/config.schema.json
@@ -1238,24 +1238,12 @@
                 },
                 "after": {
                   "$ref": "#/definitions/selfServiceAfterRegistration"
-<<<<<<< Updated upstream
-                },
-                "two_steps": {
-                  "type": "boolean",
-                  "title": "Two-step registration",
-                  "description": "When set to true, the user first fills in the traits in the first screen and then chooses a credential to sign up with in the second screen.",
-                  "default": false
-=======
-<<<<<<< Updated upstream
-=======
                 },
                 "enable_legacy_flow": {
                   "type": "boolean",
                   "title": "Disable two-step registration",
                   "description": "Two-step registration is a significantly improved sign up flow and recommended when using more than one sign up methods. To revert to one-step registration, set this to `true`.",
                   "default": true
->>>>>>> Stashed changes
->>>>>>> Stashed changes
                 }
               }
             },
diff --git a/test/e2e/profiles/passkey/identity.traits.schema.json b/test/e2e/profiles/passkey/identity.traits.schema.json
index 5026a941fa92..8dbece14adca 100644
--- a/test/e2e/profiles/passkey/identity.traits.schema.json
+++ b/test/e2e/profiles/passkey/identity.traits.schema.json
@@ -17,12 +17,9 @@
               "password": {
                 "identifier": true
               },
-<<<<<<< Updated upstream
-=======
               "webauthn": {
                 "identifier": true
               },
->>>>>>> Stashed changes
               "passkey": {
                 "display_name": true
               }
@@ -36,11 +33,7 @@
           "minLength": 10
         }
       },
-<<<<<<< Updated upstream
-      "required": ["email", "website"],
-=======
       "required": ["email"],
->>>>>>> Stashed changes
       "additionalProperties": false
     }
   }
diff --git a/test/e2e/profiles/two-steps/.kratos.yml b/test/e2e/profiles/two-steps/.kratos.yml
index 946f0e7f6409..8426278abe67 100644
--- a/test/e2e/profiles/two-steps/.kratos.yml
+++ b/test/e2e/profiles/two-steps/.kratos.yml
@@ -10,11 +10,7 @@ selfservice:
         default_browser_return_url: http://localhost:4455/login
 
     registration:
-<<<<<<< Updated upstream
-      two_steps: true
-=======
       enable_legacy_flow: false
->>>>>>> Stashed changes
       ui_url: http://localhost:4455/registration
       after:
         password: