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