Updating zsh
Adding merge.ff config to gitconfig