resolve dependency conflicts