Fixed git's merge shit in world.cs
Fixes