Log Message:
editors/emacs/modules.mk: remove explicit CONFLICTS

There's no need for CONFLICTS between the xemacs and emacs versions of
the same elisp package unless the PLISTs overlap, and if they do (most
don't because they install into different subtrees), that fact is
sufficient.

As suggested by PR 39886, a long long time ago.