# Conflicts: # frontend/src/components/canvas/components/Toolbar.vue # frontend/src/views/panel/edit/index.vue
