24.74.4 (2021-03-07) Bug Fixes don’t rebase for automerge when rebaseWhen=conflicted (#9011) (40a048d)