hotfix merge conflicts

package-lock.json

package.json

src/app/app.component.html

src/app/app.component.scss

src/app/app.component.ts

src/app/app.module.ts

src/app/app.routing.module.ts

...pp/components/formats/detail/format-detail.component.html

src/app/components/formats/detail/format-detail.component.ts

src/app/components/formats/edit/format-form.component.html

src/app/components/formats/list/formats.component.html

src/app/components/formats/list/formats.component.scss

src/app/components/formats/list/formats.component.ts

src/app/components/image-upload/image-upload.component.html

...s/logs-dashboard/logs-sessions/logs-sessions.component.ts

...ponents/logs-dashboard/logs-slugs/logs-slugs.component.ts

src/app/components/menu/menu.component.html

src/app/components/menu/menu.component.scss

src/app/components/menu/menu.component.ts

...s/organizations/detail/organization-detail.component.html