Fixed merge-strategy; including globals
Fixed merge-keys for settings