disabled vim autoindent
add gcb alias to .zshrc
change indent setting on .vimrc
add something to .vim dir
add merge alias
delete merge alias