rebase: use configoverride context manager for ui.forcemerge

Authored by martinvonz.