Add conflicts
Add conflict to lib/plotbox.rb & views/main.erb
Update version information