fixed plotting merge
fixed plotting merge