Updated iterm code
Fixed conflict