Scene changes.
Fix merge conflict.