Got homebrew installing successfully
Fixed merge conflict