# Conflicts: # src/components/gameMaster/mapEditor/Map.vue # src/components/gameMaster/mapEditor/partials/MapObjectList.vue # src/components/gameMaster/mapEditor/partials/TileList.vue # src/components/screens/MapEditor.vue # src/composables/pointerHandlers/useMapEditorPointerHandlers.ts