change json
some changes
merged