Updating iTerm prefs
Merging iTerm prefs