fixes pom files
merging