continuing to mess with pom
resolved pom conflict