Resolves merge conflicts by rebasing on current upstream HEAD. Adds Glama score badge as required by awesome-mcp-servers bot. Entry positioned alphabetically (gabriel < gblin).