Fixing Merge Conflicts?

prs.classes/EnclosedEntities/Dimensions/Dimensions.cs

@@ -154,6 +154,7 @@ namespace Comal.Classes
             {
                 bCalculating = false;
             }
+            
         }