Conflict resolution: docs/cordis-catalog/services.md regenerated on the merged tree (line-number drift only).