shopkeep
merge
some scene tweaks