made beautiful
fixed merge problem
formatted jkson output