commit
fixed conflict in plots
fixed bug with csv list in plots