diff --git a/provision/nixos/hosts/bulwark/configuration.nix b/provision/nixos/hosts/bulwark/configuration.nix
index 51eaf5b1..65f964c8 100644
--- a/provision/nixos/hosts/bulwark/configuration.nix
+++ b/provision/nixos/hosts/bulwark/configuration.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./steam-deck.nix
+    ../../modules 
   ];
 
   nix = {
@@ -112,7 +113,6 @@
     };
 
   # Enable modules
-  imports = [ ../../modules ];
   modules = {
     services = {
       samba-client.enable = true;
diff --git a/provision/nixos/hosts/bulwark/steam-deck.nix b/provision/nixos/hosts/bulwark/steam-deck.nix
index cc937c1c..156345ef 100644
--- a/provision/nixos/hosts/bulwark/steam-deck.nix
+++ b/provision/nixos/hosts/bulwark/steam-deck.nix
@@ -63,5 +63,8 @@
         };
       };
     };
+<<<<<<< HEAD
   };
+=======
+>>>>>>> b936165dedb9347725fa93e35ccaecd9bd55aa68
 }