Update dependencies and fix conflict
Fix failing test