Yep, they are combining events, probably to make the story move faster. Was a pretty good episode IMO, I'm just sad there was no Irm and his Gungrust.