i dont know if the baki and genma fight is going to continue, i dont read the manga so im not spoiling or anything
its just that they havent shown one scene of that fight for soo long already
maybe they just want us to forget about that fight
and the title for the next episode seems like it is gonna be at night, that would be kinda weird if they went back to daylight with the baki vs genma fight again.

just my thoughts, cant wait for the next episode