Updated pom versions.
Merged conflicts