Conflicts: ui/ui-frontend/projects/pastis/src/environments/environment.ts ui/ui-pastis/src/main/config/ui-pastis-application-dev.yml
