Sourcesheet with outline is here.  This shiur rapidly reviews prior constructions of the non/machloket between Rav and Rav Yochanan in the Yerushalmi; discusses whether/how that non/machloket is reflected in the Bavli, which does not cite Rav Yochanan; and how that might be affected by Rav Yochanan's position apparently conflicting with a stam mishnah or another of Rav Yochanan's own klalei horaah