diff --git a/flatpak/net.zoite.Zoitechat.json b/flatpak/net.zoite.Zoitechat.json
index 5869f1d8..14f5449b 100644
--- a/flatpak/net.zoite.Zoitechat.json
+++ b/flatpak/net.zoite.Zoitechat.json
@@ -8,6 +8,7 @@
   "finish-args": [
     "--share=ipc",
     "--socket=wayland",
+    "--socket=fallback-x11",
     "--share=network",
     "--socket=pulseaudio",
     "--filesystem=xdg-download",
@@ -20,8 +21,11 @@
 
     "--talk-name=org.kde.StatusNotifierWatcher",
     "--talk-name=com.canonical.AppMenu.Registrar",
+<<<<<<< ours
     "--own-name=org.kde.StatusNotifierItem*",
 
+=======
+>>>>>>> theirs
     "--talk-name=org.mpris.MediaPlayer2.*"
   ],
   "add-extensions": {