Or as a wrestling fan, you should realize that you shouldn't be spoonfed every detail about every single thing going on, and come to your own conclusions on issues. I've always done this. Say wrestler x feuds with wrestler y, then one turns face or heel and they both have an issue with another wrestler and seem all buddy buddy. Why do we have to be explained as to why they are friendly? Just assume they patched things up off camera. Not a hard concept to adopt. That's how you could explain HBK and Batista teaming up last year at a RAW, after their mini feud. Just assume they patched things up off screen.