Fixing a mvn conflict