fixed scene merge conflict