merge conflict

CSIP-42.ThemePark.Model.Construction.Test/ConstructionTest.cs

@@ -808,7 +808,7 @@ namespace CSIP_42.Model.Construction.Test
         }
 
         //This method builds a LARGE random park
-        //[TestMethod] //Non-Trivial - This method does not test Graph Router Searching Algorithms, because the algo. is good as proven before
+        [TestMethod] //Non-Trivial - This method does not test Graph Router Searching Algorithms, because the algo. is good as proven before
         public void SimulatedBuildingCaseMassive()
         {
             Model.N = 45;

CSIP-42.ThemePark.ViewModel/MainViewModel.cs

@@ -1281,7 +1281,7 @@ namespace CSIP_42.ViewModel
         {
             try
             {
-                var datas = _model.GetEntitiyInfoForPosition(new Position(PanelXWithOffset, PanelYWithOffset));
+                var datas = _model.GetEntitiyInfoForPosition(new Position(TableMouseXWithOffset, TableMouseYWithOffset));
                 if (datas == null)
                 {
                     ItemExtraDetailsToolTipText = "";