fixed my test scene
merged