add back unmerged scene changes