# Conflicts: # docker-compose.override.yml # src/Services/Catalog/Catalog.API/CatalogSettings.cs # src/Services/Catalog/Catalog.API/settings.json