# Conflicts: # frontend/src/components/PresetView.tsx # frontend/src/themes/muiTheme.ts # frontend/src/types/Configuration.ts