Deleted old zsh aliases, added 'fix' for git merge conflict fixing