update iterm2 settings
update conflict