modified:   vimrc
	modified:   zshrc
merged