refactor merge base logic and fix x fmt
#130161
+79
−58
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.