Flummoxed by IT: Brew update error: Your local changes to the following files would be overwritten by merge