updated deps
merged