{
  "tool": {
    "slug": "conflict-resolve",
    "title": "Conflict Resolve",
    "category": "Workspace Safety",
    "description": "Resolve simple git conflict-marker blocks using ours, theirs, or concat strategy.",
    "buyerIntent": "Use when an agent needs a mechanical conflict resolution before deeper semantic review.",
    "tokenValue": "Removes marker noise cheaply and lets the next model turn focus on semantics.",
    "method": "POST",
    "rawBlueprintSlug": "agent-git-conflict-resolver",
    "priceUSDC": 0.012,
    "latencyTargetMs": 240,
    "status": "live-preview",
    "tags": [
      "git",
      "conflict",
      "merge",
      "markers"
    ],
    "requestSchema": {
      "type": "object",
      "required": [
        "content"
      ],
      "properties": {
        "content": {
          "type": "string"
        },
        "strategy": {
          "type": "string",
          "enum": [
            "ours",
            "theirs",
            "concat"
          ],
          "default": "ours"
        }
      }
    },
    "responseSchema": {
      "type": "object",
      "properties": {
        "success": {
          "type": "boolean"
        },
        "resolvedContent": {
          "type": "string"
        },
        "hadConflicts": {
          "type": "boolean"
        },
        "error": {
          "type": "string"
        }
      }
    },
    "sampleRequest": {
      "content": "line 1\n<<<<<<< HEAD\nours\n=======\ntheirs\n>>>>>>> branch\nline 3",
      "strategy": "ours"
    },
    "sampleResponse": {
      "success": true,
      "resolvedContent": "line 1\nours\nline 3",
      "hadConflicts": true
    },
    "endpoint": "/api/v1/agent-tools/conflict-resolve/",
    "absoluteEndpoint": "https://elpa.space/api/v1/agent-tools/conflict-resolve/",
    "pageUrl": "https://elpa.space/agent-tools/#conflict-resolve",
    "rawBlueprintUrl": "https://elpa.space/raw/agent-git-conflict-resolver",
    "priceLabel": "0.012 USDC"
  },
  "payment": {
    "protocol": "x402",
    "implementation": "x402 v2 exact EVM facilitator with legacy Base USDC transaction-hash fallback",
    "network": "Base",
    "networkCaip2": "eip155:8453",
    "currency": "USDC",
    "tokenContract": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
    "recipientAddress": "0xd9d6ae1d5a2128fea511460fac8e4dea58baf153",
    "paymentHeaders": [
      "PAYMENT-SIGNATURE",
      "X-PAYMENT",
      "x402-tx-hash (legacy)"
    ],
    "challengeHeader": "PAYMENT-REQUIRED",
    "responseHeader": "PAYMENT-RESPONSE",
    "facilitatorEnv": [
      "X402_FACILITATOR_URL",
      "X402_FACILITATOR_AUTHORIZATION"
    ],
    "maxTimeoutSeconds": 120,
    "priceUSDC": 0.012,
    "x402": {
      "x402Version": 2,
      "resource": {
        "url": "https://elpa.space/api/v1/agent-tools/conflict-resolve/",
        "description": "Resolve simple git conflict-marker blocks using ours, theirs, or concat strategy.",
        "mimeType": "application/json",
        "serviceName": "ELPA Agent Tools",
        "tags": [
          "git",
          "conflict",
          "merge",
          "markers"
        ],
        "iconUrl": "https://elpa.space/logo.svg"
      },
      "accepts": [
        {
          "scheme": "exact",
          "network": "eip155:8453",
          "amount": "12000",
          "asset": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
          "payTo": "0xd9d6ae1d5a2128fea511460fac8e4dea58baf153",
          "maxTimeoutSeconds": 120,
          "extra": {
            "name": "USDC",
            "version": "2",
            "decimals": 6
          }
        }
      ],
      "paymentRequired": {
        "x402Version": 2,
        "error": "PAYMENT-SIGNATURE header is required",
        "resource": {
          "url": "https://elpa.space/api/v1/agent-tools/conflict-resolve/",
          "description": "Resolve simple git conflict-marker blocks using ours, theirs, or concat strategy.",
          "mimeType": "application/json",
          "serviceName": "ELPA Agent Tools",
          "tags": [
            "git",
            "conflict",
            "merge",
            "markers"
          ],
          "iconUrl": "https://elpa.space/logo.svg"
        },
        "accepts": [
          {
            "scheme": "exact",
            "network": "eip155:8453",
            "amount": "12000",
            "asset": "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
            "payTo": "0xd9d6ae1d5a2128fea511460fac8e4dea58baf153",
            "maxTimeoutSeconds": 120,
            "extra": {
              "name": "USDC",
              "version": "2",
              "decimals": 6
            }
          }
        ],
        "extensions": {
          "bazaar": {
            "info": {
              "discoverable": true,
              "category": "Workspace Safety",
              "tags": [
                "git",
                "conflict",
                "merge",
                "markers"
              ],
              "input": {
                "content": "line 1\n<<<<<<< HEAD\nours\n=======\ntheirs\n>>>>>>> branch\nline 3",
                "strategy": "ours"
              },
              "output": {
                "success": true,
                "resolvedContent": "line 1\nours\nline 3",
                "hadConflicts": true
              }
            },
            "schema": {
              "type": "object",
              "properties": {
                "discoverable": {
                  "type": "boolean"
                },
                "category": {
                  "type": "string"
                },
                "tags": {
                  "type": "array",
                  "items": {
                    "type": "string"
                  }
                },
                "input": {
                  "type": "object",
                  "required": [
                    "content"
                  ],
                  "properties": {
                    "content": {
                      "type": "string"
                    },
                    "strategy": {
                      "type": "string",
                      "enum": [
                        "ours",
                        "theirs",
                        "concat"
                      ],
                      "default": "ours"
                    }
                  }
                },
                "output": {
                  "type": "object",
                  "properties": {
                    "success": {
                      "type": "boolean"
                    },
                    "resolvedContent": {
                      "type": "string"
                    },
                    "hadConflicts": {
                      "type": "boolean"
                    },
                    "error": {
                      "type": "string"
                    }
                  }
                }
              }
            }
          }
        }
      },
      "paymentRequiredBase64": "eyJ4NDAyVmVyc2lvbiI6MiwiZXJyb3IiOiJQQVlNRU5ULVNJR05BVFVSRSBoZWFkZXIgaXMgcmVxdWlyZWQiLCJyZXNvdXJjZSI6eyJ1cmwiOiJodHRwczovL2VscGEuc3BhY2UvYXBpL3YxL2FnZW50LXRvb2xzL2NvbmZsaWN0LXJlc29sdmUvIiwiZGVzY3JpcHRpb24iOiJSZXNvbHZlIHNpbXBsZSBnaXQgY29uZmxpY3QtbWFya2VyIGJsb2NrcyB1c2luZyBvdXJzLCB0aGVpcnMsIG9yIGNvbmNhdCBzdHJhdGVneS4iLCJtaW1lVHlwZSI6ImFwcGxpY2F0aW9uL2pzb24iLCJzZXJ2aWNlTmFtZSI6IkVMUEEgQWdlbnQgVG9vbHMiLCJ0YWdzIjpbImdpdCIsImNvbmZsaWN0IiwibWVyZ2UiLCJtYXJrZXJzIl0sImljb25VcmwiOiJodHRwczovL2VscGEuc3BhY2UvbG9nby5zdmcifSwiYWNjZXB0cyI6W3sic2NoZW1lIjoiZXhhY3QiLCJuZXR3b3JrIjoiZWlwMTU1Ojg0NTMiLCJhbW91bnQiOiIxMjAwMCIsImFzc2V0IjoiMHg4MzM1ODlmY2Q2ZWRiNmUwOGY0YzdjMzJkNGY3MWI1NGJkYTAyOTEzIiwicGF5VG8iOiIweGQ5ZDZhZTFkNWEyMTI4ZmVhNTExNDYwZmFjOGU0ZGVhNThiYWYxNTMiLCJtYXhUaW1lb3V0U2Vjb25kcyI6MTIwLCJleHRyYSI6eyJuYW1lIjoiVVNEQyIsInZlcnNpb24iOiIyIiwiZGVjaW1hbHMiOjZ9fV0sImV4dGVuc2lvbnMiOnsiYmF6YWFyIjp7ImluZm8iOnsiZGlzY292ZXJhYmxlIjp0cnVlLCJjYXRlZ29yeSI6IldvcmtzcGFjZSBTYWZldHkiLCJ0YWdzIjpbImdpdCIsImNvbmZsaWN0IiwibWVyZ2UiLCJtYXJrZXJzIl0sImlucHV0Ijp7ImNvbnRlbnQiOiJsaW5lIDFcbjw8PDw8PDwgSEVBRFxub3Vyc1xuPT09PT09PVxudGhlaXJzXG4+Pj4+Pj4+IGJyYW5jaFxubGluZSAzIiwic3RyYXRlZ3kiOiJvdXJzIn0sIm91dHB1dCI6eyJzdWNjZXNzIjp0cnVlLCJyZXNvbHZlZENvbnRlbnQiOiJsaW5lIDFcbm91cnNcbmxpbmUgMyIsImhhZENvbmZsaWN0cyI6dHJ1ZX19LCJzY2hlbWEiOnsidHlwZSI6Im9iamVjdCIsInByb3BlcnRpZXMiOnsiZGlzY292ZXJhYmxlIjp7InR5cGUiOiJib29sZWFuIn0sImNhdGVnb3J5Ijp7InR5cGUiOiJzdHJpbmcifSwidGFncyI6eyJ0eXBlIjoiYXJyYXkiLCJpdGVtcyI6eyJ0eXBlIjoic3RyaW5nIn19LCJpbnB1dCI6eyJ0eXBlIjoib2JqZWN0IiwicmVxdWlyZWQiOlsiY29udGVudCJdLCJwcm9wZXJ0aWVzIjp7ImNvbnRlbnQiOnsidHlwZSI6InN0cmluZyJ9LCJzdHJhdGVneSI6eyJ0eXBlIjoic3RyaW5nIiwiZW51bSI6WyJvdXJzIiwidGhlaXJzIiwiY29uY2F0Il0sImRlZmF1bHQiOiJvdXJzIn19fSwib3V0cHV0Ijp7InR5cGUiOiJvYmplY3QiLCJwcm9wZXJ0aWVzIjp7InN1Y2Nlc3MiOnsidHlwZSI6ImJvb2xlYW4ifSwicmVzb2x2ZWRDb250ZW50Ijp7InR5cGUiOiJzdHJpbmcifSwiaGFkQ29uZmxpY3RzIjp7InR5cGUiOiJib29sZWFuIn0sImVycm9yIjp7InR5cGUiOiJzdHJpbmcifX19fX19fX0=",
      "facilitator": {
        "url": "https://api.cdp.coinbase.com/platform/v2/x402",
        "verify": "/verify",
        "settle": "/settle"
      },
      "legacy": {
        "enabled": true,
        "header": "x402-tx-hash",
        "note": "Legacy Base USDC transaction-hash receipts remain accepted for manual testing, but PAYMENT-SIGNATURE is the primary x402 path."
      }
    }
  }
}