diff --git a/electrum_nmc/gui/qt/__init__.py b/electrum_nmc/gui/qt/__init__.py
index 30d1ffe8c5ef..3da70735b870 100644
--- a/electrum_nmc/gui/qt/__init__.py
+++ b/electrum_nmc/gui/qt/__init__.py
@@ -42,6 +42,21 @@
 from PyQt5.QtCore import QObject, pyqtSignal, QTimer
 import PyQt5.QtCore as QtCore
 
+# This trick allows accessing electrum_nmc from import statements as electrum,
+# so we can avoid merge conflicts while also avoiding namespace collisions with
+# upstream.
+import pkgutil
+import importlib
+import sys
+electrum_nmc = importlib.import_module('electrum_nmc')
+sys.modules['electrum'] = electrum_nmc
+for _, name, _ in pkgutil.iter_modules(['electrum_nmc']):
+    try:
+        m = importlib.import_module('electrum_nmc' + '.' + name)
+        sys.modules['electrum' + '.' + name] = m
+    except:
+        pass
+
 from electrum.i18n import _, set_language
 from electrum.plugin import run_hook
 from electrum.base_wizard import GoBack
diff --git a/setup.py b/setup.py
index b335056a77cb..0f343a532c02 100755
--- a/setup.py
+++ b/setup.py
@@ -79,7 +79,7 @@
             'wordlist/*.txt',
             'locale/*/LC_MESSAGES/electrum.mo',
         ],
-        'electrum.gui': [
+        'electrum_nmc.gui': [
             'icons/*',
         ],
     },