remove plot.cpp
pushing changes for debugging
conflicts fixed