Fix main scene - committed with conflicts