Add history shortcut
Add fix_dropbox_conflics alias to zsh