Cask updates
Resolve Cask conflicts