Fixed scene merge conflict