added user study plotter
resolved conflicts