Merge two branches that were created within one second of one another.
There is a race condition in the anti-forking logic that allowed this
fork to occur.