fixed a merge conflict in plotting script
fixed a merge conflict in plot routine