Optimize GameObjects
fix merge conflicts