diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 4d30f9158..0b2b14739 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -42,13 +42,8 @@ class Charges(BaseModel):
     webhook: Optional[str]
     completelink: Optional[str]
     completelinktext: Optional[str] = "Back to Merchant"
-<<<<<<< HEAD
-    extra: str = "{}"
-    custom_css: Optional[str]
-=======
     custom_css: Optional[str]
     extra: str = DEFAULT_MEMPOOL_CONFIG
->>>>>>> main
     time: int
     amount: int
     balance: int