Fix brew update that results in message ... "Your local changes to the following files would be overwritten by merge"