As much as I hate River Song, that was pretty cool.
Amy said she just saw the Dr. Die in her convo with River at the end, implying Lake Silencio happened in the immediate past. However this is at odds with all the episodes we saw after the Season opener since that happened after Lake Silencio.Also, I don't see where everyone is getting the idea that this season's events got overwritten/erased in the finale, could someone explain it to me?
However I honestly think that's just wrong. It wass either a mistake in the script, or (as I believe) Amy's crack means she remembers the alt-timeline from the finale, so even though the convo is happening after the Dr. dropped them off in God Complex, she has the memories of alt-Amy, so to her it just happened again.
Edit: Except she doesn't say that. She just says he's dead & talks about killing Kovarian in the alt-timeline, so it must just be the memories.