new pom2
resolved conflict