diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py
index 4a6b6ef..001bb4e 100755
--- a/cashu/wallet/cli.py
+++ b/cashu/wallet/cli.py
@@ -120,11 +120,7 @@ async def invoice(ctx, amount: int, hash: str):
     return
 
 
-<<<<<<< HEAD
-@cli.command("pay", help="Pay a Lightning invoice to send you tokens from the mint back into the Lightning Network.")
-=======
 @cli.command("pay", help="Pay Lightning invoice.")
->>>>>>> parent of 352d053 (Adjust some help for CLI)
 @click.argument("invoice", type=str)
 @click.option(
     "--yes", "-y", default=False, is_flag=True, help="Skip confirmation.", type=bool
@@ -224,12 +220,7 @@ async def receive(ctx, coin: str, lock: str):
     wallet.status()
 
 
-<<<<<<< HEAD
-@cli.command("burn", help="Burn spent coins. After spending some coins you need to burn them to prevent the wallet to do a double spent."
-                          "This will be blocked by the mint, cause it holds the info about all spent coins.")
-=======
 @cli.command("burn", help="Burn spent coins.")
->>>>>>> parent of 352d053 (Adjust some help for CLI)
 @click.argument("coin", required=False, type=str)
 @click.option("--all", "-a", default=False, is_flag=True, help="Burn all spent coins.")
 @click.option(
@@ -258,13 +249,7 @@ async def burn(ctx, coin: str, all: bool, force: bool):
     await wallet.invalidate(proofs)
     wallet.status()
 
-
-<<<<<<< HEAD
-@cli.command("pending", help="Show pending coins. This shows all the coins that was already used to send, but not claimed yet by the receiver."
-                             "If you want to cancel the send, you can claim the coins again with the receive command.")
-=======
 @cli.command("pending", help="Show pending coins.")
->>>>>>> parent of 352d053 (Adjust some help for CLI)
 @click.pass_context
 @coro
 async def pending(ctx):