Fixed scene merge conflict
Merge pull request #95 from JohnMai/alim4

Fixed scene merge conflict