Auto-merging supervisors/run-curogram-refresh.sh
CONFLICT (add/add): Merge conflict in supervisors/run-curogram-refresh.sh
Auto-merging tools/curogram-mcp/cdp-harvest.ts
CONFLICT (add/add): Merge conflict in tools/curogram-mcp/cdp-harvest.ts
Auto-merging tools/curogram-mcp/cdp-relogin.ts
CONFLICT (add/add): Merge conflict in tools/curogram-mcp/cdp-relogin.ts
Auto-merging tools/curogram-mcp/curogram-auth.test.ts
CONFLICT (add/add): Merge conflict in tools/curogram-mcp/curogram-auth.test.ts
Auto-merging tools/curogram-mcp/curogram-auth.ts
CONFLICT (content): Merge conflict in tools/curogram-mcp/curogram-auth.ts
Auto-merging tools/curogram-mcp/refresh-session.ts
CONFLICT (add/add): Merge conflict in tools/curogram-mcp/refresh-session.ts
Automatic merge failed; fix conflicts and then commit the result.