upgrades
remove caching from development, update gems
remove cooltools group
resolve merge conflicts
merge conflict