update deps
merge