o.c.u.file: pom had merge conflict unresolved
Merge pull request #605 from berryma4/master

o.c.u.file: pom had merge conflict unresolved