merging into master from JSON