diff --git a/variables.nix b/variables.nix
index 2c7c07c..0390ae8 100644
--- a/variables.nix
+++ b/variables.nix
@@ -45,29 +45,11 @@
   # the installer image's nixos/root users.
   adminSshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCq/Q5LvIXlZwO2kdeAN5nLGZ59nZB7JHYMEszHxmNtGMzv1lM31jiPNsr0z2EKVZhE7OOfa2IF9rhWYD7JUA9G0yzdZ4WTXFNGVVOJoOVH6vAF3XCxoVilOEwTc7h2Wiy+rzd0B28/3spffzQQWJhY6GRQVa8j+6xAGF60Fcvl1vLosYT9Bn2ZbK4TCWOwAn2jqXIieGpZdn/UNZbGOeKRiCvhktDfMAzuQzN/9jMu/oF4pkPn2X1UrsQdNlvp0Ci8md612MozIpncQJyAF1ADhunr3sMx0isUXiqD29R5DS4TftpekqLNLak+zcxFa8N7DcRNp3DcKfJvyTkwQrR4r+b7lFLYOLHLagSso9CzeW/paAS2q9I5SBm/2DtE1diLLg2jZikYcstsu/G5RgvbzbKqjiaMwTdXC3AMvDxQrs7U5pDRZFzoofG3cpODbTm+uy3m0kP70z0M1K45UbDG0p+itnTu9x40JbQEgefbx38AItNvAIx1A8HO4I1VX28= wayne@stream";
 
-<<<<<<< Updated upstream
-  # Prestaged wifi SSID for the gui host's NetworkManager profile
-  # (modules/networking/wifi.nix). Leave blank until the network is known
-  # — an empty ssid disables the profile rather than creating a broken
-  # empty one. The password is not here -- it's sops-encrypted in
-  # secrets/gui.yaml (wifi-password) instead, since this file isn't a
-  # secret store.
-  wifiSsid = "";
-
-  # Bare-metal gui host's two disks for a ZFS RAID0 (striped) root pool
-  # (modules/disko/baremetal.nix). Only used transiently at disko-format
-  # time (partitioning); the resulting fileSystems/zpool import reference
-  # by-partlabel/by-id paths afterward regardless, same as
-  # modules/disko/proxmox.nix's own plain "/dev/sda".
-  guiRootDisk1 = "/dev/sda";
-  guiRootDisk2 = "/dev/sdb";
-=======
   # Prestaged wifi credentials for the gui host's NetworkManager profile
   # (modules/networking/wifi.nix). Leave blank until the bare-metal
   # hardware profile is wired up — an empty ssid disables the profile
   # rather than creating a broken empty one.
   wifiSsid = "nbn-fttp-net-5G";
->>>>>>> Stashed changes
 
   # System
   timeZone = "Australia/Brisbane";