Conflicts in jmetal.util fixed