diff --git a/cmd/crunchyroll-go/cmd/login.go b/cmd/crunchyroll-go/cmd/login.go
index bfef794..0c00100 100644
--- a/cmd/crunchyroll-go/cmd/login.go
+++ b/cmd/crunchyroll-go/cmd/login.go
@@ -135,13 +135,10 @@ func loginCredentials(user, password string) error {
 					"To encrypt it, use the `--encrypt` flag", filepath.Join(configDir, "crunchyroll-go", "crunchy"))
 			}
 		}
-	}
-<<<<<<< v3/feature/encrypted-credentials
-=======
+		
 	if err = os.WriteFile(filepath.Join(os.TempDir(), ".crunchy"), []byte(c.EtpRt), 0600); err != nil {
 		return err
 	}
->>>>>>> next/v3
 
 	if !loginPersistentFlag {
 		out.Info("Due to security reasons, you have to login again on the next reboot")