outputting correct JSON now
fixed merge conflict