code: small cosmetic changes
add test: merge global and local locals
add test for #25
use shallow merge. Fixes #25