# Conflicts: # src/app/core/shell/shell.component.html # src/app/organization/organization-routing.module.ts # src/environments/.env.ts
# Conflicts: # src/app/core/shell/shell.component.html # src/app/organization/organization-routing.module.ts # src/environments/.env.ts