we fixed the scene
conflic