# Conflicts: # Frontend Angular 4/src/app/app.module.ts # Frontend Angular 4/src/app/shared/config.ts