updated versions
updated deps
merged