Update dependencies
Just merging