Undoes changes in Dynamiz.java
Merges conflict from pull
Fixes conflict from pull