Resolving scene conflicts