-Fixed merge errors
-Versions work finely together now