Added new vim merging aliases to fish shell and zsh shell. All the bases covered