a file to (successfully) load and test the SO, can build with mvn
merge conflicts, accept remote