Merge "Retry router removal on conflict" into mcp/caracal