Fixed some merge conflicts and activated managers in procgen scene