Resolve dependency conflict