GamestateUpdate completed, Simulation, ResourceManager, main uncommented
simulation conflicts resolved