bump deps
merge update deps