fix pom that was broken by merge