# Conflicts: # angular.json # package-lock.json # package.json # src/app/app.component.html # src/app/app.routes.ts