How did JB and his brother make up?

There is tension between the two brothers which comes to a head when Josh throws a ball at JB and nearly breaks his nose. JB goes holds a grudge against Josh until Dad's health begins to decline.