fix pom for upstream merge