Now that Zoe has returned, you are faced with the task of merging these two separate branches of development into a single snapshot.
But how?
