update iterm settings
fix conflict in iterm