Fixing pom issues
Fixing conflicts issue