gnuplot plotter; merge conflict fix