resolve dependency conflict