vim tests, zshrc updat
merge