@bastek66 Not exactly. The ending is vague enough that you can decide what you want. However, there are a lot of hints through the chapter that they're still switched.
For instance, whoever's in Yui's body greets whoever's in Yuuta's body the same way as when they were switched throughout the...