diff --git a/lnbits/extensions/lnurldevice/crud.py b/lnbits/extensions/lnurldevice/crud.py
index 16baae1e3..0ab520da7 100644
--- a/lnbits/extensions/lnurldevice/crud.py
+++ b/lnbits/extensions/lnurldevice/crud.py
@@ -118,6 +118,7 @@ async def create_lnurldevicepayment(
     sats: Optional[int] = 0,
 ) -> lnurldevicepayment:
     device = await get_lnurldevice(deviceid)
+    assert device
     if device.device == "atm":
         lnurldevicepayment_id = shortuuid.uuid(name=payload)
     else:
diff --git a/lnbits/extensions/lnurldevice/lnurl.py b/lnbits/extensions/lnurldevice/lnurl.py
index 978ea0e15..b14bd613a 100644
--- a/lnbits/extensions/lnurldevice/lnurl.py
+++ b/lnbits/extensions/lnurldevice/lnurl.py
@@ -236,13 +236,10 @@ async def lnurl_callback(
         else:
             if lnurldevicepayment.payload != k1:
                 return {"status": "ERROR", "reason": "Bad K1"}
-<<<<<<< HEAD
-            lnurldevicepayment = await update_lnurldevicepayment(
-=======
             if lnurldevicepayment.payhash != "payment_hash":
                 return {"status": "ERROR", "reason": f"Payment already claimed"}
+
             lnurldevicepayment_updated = await update_lnurldevicepayment(
->>>>>>> c2f4a7c9 (fix mypy lnurldevices issues)
                 lnurldevicepayment_id=paymentid, payhash=lnurldevicepayment.payload
             )
             assert lnurldevicepayment_updated