resolved dependency conflict