fix maven conflicts