# Conflicts: # frontend/package-lock.json # frontend/src/app/components/master-page/master-page.component.html