resolved pom conflicts