fix conflicts

Assets/Scripts/Player/Player.cs

@@ -24,6 +24,8 @@ public class Player : MonoBehaviour
     public Dictionary<StatsId, Stat> Stats;
     public JobPositions JobPosition { get; set; }
 
+    public EducationSkill Education {  get; set; }
+
     private readonly Queue<PlayerTasks> _tasks = new Queue<PlayerTasks>();
     private PlayerTasks _currentTask;