added json support
merge