Fix the merge
Update some of the dependencies