Jerry was starting at a new school.
Jerry went up to him and shook his hand to dispel the tension.
He saw his neighbor who he became friends with yesterday.
He saw his neighbor who he argued with yesterday.