Resolve version conflict in project POM