diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
index 5e5a7a9..83d77eb 100644
--- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
+++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.cpp
@@ -24,14 +24,10 @@ GestionJeu::GestionJeu()
 
 GestionJeu::~GestionJeu()
 {
-<<<<<<< HEAD
 	delete gTerrain;
 	delete gPlayer;
 	delete gMobs;
 	delete gCollision;
-=======
-	delete gMobs;
->>>>>>> origin/master
 }
 
 /**