fixing unmerged scene