merged, diags stopped working...