# Conflicts: # package-lock.json # src/app/app.component.ts # src/app/app.module.ts # src/app/shared/shared.module.ts