typed: Split merge into merge and compare

This keeps the code similar and merely splits merge in between merge and
compare which will make it easier to modify one without affecting the
other.

Author: apelisse