Once you complete the merge, Zoe fetches all the snapshots that you have that she does not:
- Your development on the ‘math’ branch (blue)
- The merge snapshot.
Once she does this, both of your histories match exactly!