Partially backport #29985, fix some template errors. * fix the manual-merge form * fix the 404 page
member
collaborator
contributor
first-time contributor