updated dependencies
merged