showing json output
fixed merge problem
now json output more beautiful