Update scene.js

fixing merge conflicts