fix: remove committed merge conflict marker from server.json

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Author: Lyra

server.json

@@ -2,7 +2,6 @@
   "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
   "name": "io.github.BuyWhere/buywhere-mcp",
   "title": "BuyWhere MCP",
-<<<<<<< Updated upstream
   "description": "BuyWhere MCP \u2014 cross-border product search & price comparison. Singapore, SEA, US markets.",
   "repository": {
     "url": "https://github.com/BuyWhere/buywhere-mcp",