Commit 0c293f1520 caused a conflict such that there are now two
functions named ‘package-menu--refresh’.  The attached patch
renames them to:

* ‘package-menu--refresh-entries’, which refreshes
  ‘tabulated-list-entries’; and

* ‘package-menu--refresh-contents’, which refreshes the archive
  contents.