Resolve conflicts

snippets/rust/src/send_payment.rs

@@ -5,12 +5,14 @@ use breez_sdk_core::*;
 
 async fn send_payment(sdk: Arc<BreezServices>) -> Result<()> {
     // ANCHOR: send-payment
-    let bolt11 = "...".into();
-
-    sdk.send_payment(SendPaymentRequest {
-        bolt11,
-        amount_msat: None
-    }).await?;
+    // The `amount_msat` param is optional and should only passed if the bolt11 doesn't specify an amount.
+    // The amount_msat is required in case an amount is not specified in the bolt11 invoice'.
+    let amount_msat: Option<u64> = None;
+    let req = SendPaymentRequest {
+        bolt11: "...".into(),
+        amount_msat,
+    };
+    let response = sdk.send_payment(req).await?;
     // ANCHOR_END: send-payment
 
     Ok(())