Started on plot 2
Started on plot2 and fixed merge conflicts
Fixed merge conflict
Fixed merge conflict error
Fixed merge conflicts