Convert `merge` to use Option instead of Either.

Per @jdegoes’ suggestion.