updated json builder
resolved conflict