# Conflicts: # backend/app/services/espidf_compiler.py # frontend/src/components/editor/EditorToolbar.tsx # frontend/src/utils/vlxFile.ts