more beautiful style
fixed merge problem
now json output more beautiful