Nami has said will be an epilogue wrapping up the story after the final part of chapter 8.
So unless the epilogue is where the climax happens, it ends with Trick, huh?
Not exactly sure what that wandering wolf will do, to end this...