I believe that it was Cloud and Kadaj fighting. I may be wrong, but I did see it. It was after all of that happened near the end, I believe. Where Kadaj and Cloud were fighting and then Yuffie and the gang come up to rescue Cloud in an airship. Perhaps I'm missing a few parts, but I really don't think that it was Yazoo and Cloud who were fighting.