pom fixes
merging