Reapply fmt::merge change