merge resolution
smaller scene; code cleanup