fixed erroneous merge pom versions