Conflict in pom
Reverted changes from pull request