diff --git a/flake.lock b/flake.lock
index 70e52a9..d9358fa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -539,11 +539,19 @@
     },
     "nix-secrets": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1738685297,
         "narHash": "sha256-JOv3+toYlftzBm47QF5tzaBhTbQIm1IBq1tKeQrQLyM=",
         "ref": "refs/heads/master",
         "rev": "3be1d509f9823292dd9ca6b396743fbf722bd8b9",
         "revCount": 269,
+=======
+        "lastModified": 1738356588,
+        "narHash": "sha256-mb3P2bNaZuCz1is4NR05r2xm66n6ABQAkYLP5U5/eCY=",
+        "ref": "refs/heads/master",
+        "rev": "3ae59d3cfe419e10087da719129cca5c01b8cbcd",
+        "revCount": 267,
+>>>>>>> 24e1bc1 (add restic-exporter to prometheus metrics)
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },
diff --git a/hosts/common/optional/nixos-containers/metrics-server.nix b/hosts/common/optional/nixos-containers/metrics-server.nix
index a880109..0865aa2 100644
--- a/hosts/common/optional/nixos-containers/metrics-server.nix
+++ b/hosts/common/optional/nixos-containers/metrics-server.nix
@@ -102,9 +102,12 @@ in {
         secrets = {
           "software/restic-passphrase" = {};
           "software/restic-exporter-credentials" = {};
+<<<<<<< HEAD
           "comms/xmpp/notifybot/password" = {
             mode = "0644";
           };
+=======
+>>>>>>> 24e1bc1 (add restic-exporter to prometheus metrics)
         };
       };
 
@@ -243,6 +246,7 @@ in {
             repeat_interval: 1h
             receiver: 'xmpp-alerts'
 
+<<<<<<< HEAD
           receivers:
           - name: 'xmpp-alerts'
             webhook_configs:
@@ -286,6 +290,23 @@ in {
           passwordFile = config.sops.secrets."software/restic-passphrase".path;
           refreshInterval = 10800; # refresh every 3 hours
           port = 8001;
+=======
+            '';
+          };
+          node = {
+            enable = true;
+            enabledCollectors = ["systemd"];
+            port = 9002;
+          };
+          restic = {
+            enable = true;
+            repository = "";
+            environmentFile = config.sops.secrets."software/restic-exporter-credentials".path;
+            passwordFile = config.sops.secrets."software/restic-passphrase".path;
+            refreshInterval = 10800; # refresh every 3 hours
+            port = 8001;
+          };
+>>>>>>> 24e1bc1 (add restic-exporter to prometheus metrics)
         };
       };