Update pom for a uP4 compatible release
fix merge conflict in pom