Update traditional diagnostics.
Update json.
Fixed merge conflict.