> update
$ copy-file changes/conflict-error.sbt conflict-error.sbt

> reload
-> update
