Force resolve conflict and update dependencies 059d982 FerrellSyntheticIntelligence commited on 4 days ago