diff --git a/README.md b/README.md
index 82e21e8..872318b 100644
--- a/README.md
+++ b/README.md
@@ -63,11 +63,7 @@ To run Soul in auth mode, allowing login and signup features with authorization
 Run the Soul command with the necessary parameters:
 
 ```
-<<<<<<< HEAD
-soul --d foobar.db -a -ats <your_jwt_access_token_secret_value> -atet=4H -rts <your_jwt_refresh_token_secret_value> -rtet=3D -iuu=john -iup=<your_password>
-=======
 soul --d foobar.db -a -ts <your_jwt_secret_value> -atet=4H -rtet=3D
->>>>>>> authorization_feature
 ```
 
 Note: When configuring your JWT Secret, it is recommended to use a long string value for enhanced security. It is advisable to use a secret that is at least 10 characters in length.
@@ -77,15 +73,9 @@ In this example:
 The `-a` flag instructs Soul to run in auth mode.
 The `-ts` flag allows you to pass a JWT secret value for the `access and refresh tokens` generation and verification. Replace <your_jwt\_\_secret_value> with your desired secret value.
 The `-atet` flag sets the JWT expiration time for the access token. In this case, it is set to four hours (4H), meaning the token will expire after 4 hours.
-<<<<<<< HEAD
-The `-rts` flag allows you to pass a JWT secret value for the `refresh token` generation and verification. Replace <your_jwt_refresh_token_secret_value> with your desired secret value.
 The `-rtet` flag sets the JWT expiration time for the refresh token. In this case, it is set to three days (3D), meaning the token will expire after 3 days.
 The `-iuu` flag is used to pass a username for the initial user
 The `-iup` flag is used to pass a password for the initial user
-=======
-Teh `-rtet` flag sets the JWT expiration time for the refresh token. In this case, it is set to three days (3D), meaning the token will expire after 3 days.
-
-> > > > > > > authorization_feature
 
 Here are some example values for the `-atet` and `rtet` flags