Season 6 ending (spoiler)

The season ending seemed abrupt and out of place showing everyone back to normal and healed up. I thought they were all flashbacks but it wasn't. There was no "1 months later" text or anything so that confused me. Wonder if there was actually a different alternate ending and they used this instead.