My money's on this episode featuring a fusion between Peridot and Connie. I know it's a long shot, but what's life without some risks?
I don't think Lapis was living at the barn at that time, so this still might be the first time she and Connie have been in the same place since the drowning attempt.