diff --git a/Sources/DTO/ChampionDTO.cs b/Sources/DTO/ChampionDTO.cs
index b56e6a1..922d56e 100644
--- a/Sources/DTO/ChampionDTO.cs
+++ b/Sources/DTO/ChampionDTO.cs
@@ -25,16 +25,6 @@ namespace DTO
         //public ChampionClass Class { get; set; }
         public string Icon { get; set; }
 
-<<<<<<< Updated upstream
-        /// <summary>
-        /// pour plus tard ?
-        /// </summary>
-        //public ImmutableHashSet<Skill> Skills { get; set; }    
-        
-        //public ICollection<Skill> Skills { get; set; }
-=======
->>>>>>> Stashed changes
-
         public bool equals(ChampionDTO other)
         {
             return other.Name==this.Name && other.Bio==this.Bio && other.Icon==this.Icon;