Brody Stevens and Jonah Ray patch things up after a public Twitter tiff