Update deps
Resolve merge conflicts