uncomfortable merge with raw scenes resolved