solved dependency conflict