363 Fix dependency conflict