update deps
fix conflicts