Update scenario.cache
Fix merge conflict