diff --git a/front/components/editor/BallPiece.tsx b/front/components/editor/BallPiece.tsx
index 685705e..d27c407 100644
--- a/front/components/editor/BallPiece.tsx
+++ b/front/components/editor/BallPiece.tsx
@@ -11,4 +11,5 @@ export interface CourtBallProps {
 
 export function BallPiece() {
     return <BallSvg className={"ball"} />
-}
\ No newline at end of file
+}
+
diff --git a/front/components/editor/CourtBall.tsx b/front/components/editor/CourtBall.tsx
index e050efb..f2c32e6 100644
--- a/front/components/editor/CourtBall.tsx
+++ b/front/components/editor/CourtBall.tsx
@@ -28,4 +28,4 @@ export function CourtBall({ onMoved, ball, onRemove }: CourtBallProps) {
             </div>
         </Draggable>
     )
-}
\ No newline at end of file
+}
diff --git a/front/components/editor/CourtPlayer.tsx b/front/components/editor/CourtPlayer.tsx
index e375c78..a5f9c51 100644
--- a/front/components/editor/CourtPlayer.tsx
+++ b/front/components/editor/CourtPlayer.tsx
@@ -1,10 +1,6 @@
 import { RefObject, useRef } from "react"
 import "../../style/player.css"
-<<<<<<< HEAD
 import { BallPiece } from "./BallPiece"
-=======
-import {BallPiece} from "./BallPiece"
->>>>>>> 20078f8 (can put the ball on the court if we want)
 import Draggable from "react-draggable"
 import { PlayerPiece } from "./PlayerPiece"
 import { Player } from "../../tactic/Player"
@@ -71,7 +67,6 @@ export default function CourtPlayer({
                         if (e.key == "Delete") onRemove()
                     }}>
                     <div className="player-selection-tab">
-<<<<<<< HEAD
                         {hasBall && (
                             <Draggable
                                 nodeRef={ballPiece}
@@ -86,15 +81,6 @@ export default function CourtPlayer({
                                 </div>
                             </Draggable>
                         )}
-=======
-                        {hasBall && (<Draggable nodeRef={ballPiece}
-                                                onStop={() => onBallDrop(ballPiece.current!.getBoundingClientRect())}
-                                                position={{x:0, y: 0}}>
-                            <div ref={ballPiece}>
-                                <BallPiece />
-                            </div>
-                        </Draggable>)}
->>>>>>> 20078f8 (can put the ball on the court if we want)
                     </div>
                     <PlayerPiece
                         team={player.team}
diff --git a/front/style/ball.css b/front/style/ball.css
index 7862b82..6a30738 100644
--- a/front/style/ball.css
+++ b/front/style/ball.css
@@ -11,4 +11,6 @@
 }
 
 .ball-div:focus-within {
-}
\ No newline at end of file
+
+}
+
diff --git a/front/style/editor.css b/front/style/editor.css
index 15dd485..7b299de 100644
--- a/front/style/editor.css
+++ b/front/style/editor.css
@@ -48,13 +48,10 @@
 #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 {
@@ -119,6 +116,4 @@
 .save-state-saving,
 .save-state-guest {
     color: gray;
-}
-
-
+}
\ No newline at end of file