json generation added
merge done