diff --git a/Sources/EntityFramework/ChampionEntity.cs b/Sources/EntityFramework/ChampionEntity.cs
index d2a59a0..5d2c455 100644
--- a/Sources/EntityFramework/ChampionEntity.cs
+++ b/Sources/EntityFramework/ChampionEntity.cs
@@ -32,11 +32,7 @@ namespace EntityFramework
         //public ImmutableHashSet<Skill> Skills => skills.ToImmutableHashSet();
         //private HashSet<Skill> skills = new HashSet<Skill>();
 
-<<<<<<< Updated upstream
         private ICollection<SkillEntity> Skills { get; set; }
-=======
-        public ICollection<Skill> Skills { get; set; } 
->>>>>>> Stashed changes
 
         public ChampionEntity(string name,string bio,string icon) {
             this.Name = name;
@@ -53,15 +49,9 @@ namespace EntityFramework
 
 
         public void AddSkill(SkillEntity skill)
-<<<<<<< Updated upstream
-            => this.Skills.Add(skill);
-
-        public bool RemoveSkill(SkillEntity skill)
-=======
             => Skills.Add(skill);
 
-        public void RemoveSkill(Skill skill)
->>>>>>> Stashed changes
+        public void RemoveSkill(SkillEntity skill)
             => Skills.Remove(skill);
     }
 }
diff --git a/Sources/EntityFramework/champion.db b/Sources/EntityFramework/champion.db
index aa8a7ea..662e972 100644
Binary files a/Sources/EntityFramework/champion.db and b/Sources/EntityFramework/champion.db differ