Fix file conflict action again (which was broken because of a recent merge).
Plus a UI layout fix: the "include prerelease" checkbox won't get covered
by the search box.