blash
Merge branch 'master' of github.com:janck76/zsh-castle
Merge branch 'master' of github.com:janck76/zsh-castle
ok
Merge branch 'master' of github.com:janck76/zsh-castle

Conflicts:
	home/.oh-my-zsh/custom/alias.zsh
ok