Fix dependency conflicts