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