Fix merge conflicts

BauSystem_Main/src/de/steamwar/bausystem/commands/CommandFreeze.java

@@ -88,16 +88,6 @@ public class CommandFreeze extends RegionToggleCommand {
         });
     }
 
-    @EventHandler
-    public void onEntitySpawn(EntitySpawnEvent e) {
-        e.setCancelled(true);
-    }
-
-    @EventHandler
-    public void onEntityChangeBlock(EntityChangeBlockEvent e) {
-        e.setCancelled(true);
-    }
-
     @EventHandler
     public void onPhysicsEvent(BlockPhysicsEvent e){
         Region.getRegion(e.getBlock().getLocation(), region -> {