dependency conflict fix