3d-nized conflict objects for merging
Merge branch 'master' of https://github.com/timohtey/GAMEDEV-PlanetGox
serialized for vcs
serialized for vcs