# Conflicts: # front/package.json # front/src/Components/App.svelte # front/src/Phaser/Game/GameScene.ts # front/src/Phaser/Menu/MenuScene.ts # front/src/WebRtc/MediaManager.ts
# Conflicts: # front/package.json # front/src/Components/App.svelte # front/src/Phaser/Game/GameScene.ts # front/src/Phaser/Menu/MenuScene.ts # front/src/WebRtc/MediaManager.ts