Yep. That happened, and I'm happy it did.
I mean honestly didn't any of you think of the battle between the twins and Scott when you first saw the discord ending? No? Just me? Whatever. Enjoy everypony.

Song: Threshold - Beck
Movie: Scott Pilgrim Vs The World