edit .zshrc
merge .zshrc
Merge branch 'master' into HEAD

Conflicts:
	.zshrc