Conflicts: generated docs only (cordis services catalog and the website sessions API page) — resolved by regenerating both over the merged sources.
Conflicts: generated docs only (cordis services catalog and the website sessions API page) — resolved by regenerating both over the merged sources.