Fix merge conflict
Correct z-index of current scene