fix bad merge
fix bad merge

feedhenry/mcp-standalone,matzew/mcp-standalone,feedhenry/mcp-standalone,feedhenry/mcp-standalone,matzew/mcp-standalone,feedhenry/mcp-standalone,matzew/mcp-standalone,matzew/mcp-standalone