updated pom.xml local
resolved pom.xml conflics