merged conflict in aliases.zsh