fix pom after merge