diff --git a/front/style/editor.css b/front/style/editor.css
index 93860c7..f7b2588 100644
--- a/front/style/editor.css
+++ b/front/style/editor.css
@@ -48,10 +48,13 @@
 #allies-rack {
     width: 125px;
     min-width: 125px;
+<<<<<<< HEAD
     display: flex;
     flex-direction: row;
     align-items: flex-end;
     justify-content: flex-start;
+=======
+>>>>>>> 6b6f448 (fix css, topbar (ball) do not move anymore on drag of a player)
 }
 
 #opponent-rack {
diff --git a/front/views/Editor.tsx b/front/views/Editor.tsx
index 1a5b861..2ee86a8 100644
--- a/front/views/Editor.tsx
+++ b/front/views/Editor.tsx
@@ -29,6 +29,7 @@ import SavingState, {
     SaveState,
     SaveStates,
 } from "../components/editor/SavingState"
+import * as Console from "console";
 
 import {CourtObject} from "../tactic/CourtObjects";