#4 fixed problem with _.merge

Fusionado

herby fusionadas 1 achegas de psvensson/master en herby/master %!s(int64=4) %!d(string=hai) anos

Autor	SHA1 Mensaxe	Data
Peter Svensson	fbbfa2be9f changed lodash merge to mergeWith to solve breaking changes when upgrading	%!s(int64=4) %!d(string=hai) anos