Resolve merge conflict

Conflicts:
	zsh/.zshrc
	zsh/aliases.zsh
	zsh/functions.zsh
Resolve merge conflict