Now, if we switch back to master and try merge alternate_reality into it, we'll be presented with an error message.

Snap! Merging alternate_reality into master causes a merge conflict and Git doesn't know which version we want to keep.

Aren't we already on master and want to merge alternate_reality into it?