diff --git a/nixos-infect b/nixos-infect
index 06f0171..81ac0f3 100644
--- a/nixos-infect
+++ b/nixos-infect
@@ -41,6 +41,14 @@ makeConf() {
     $NIXOS_IMPORT
   ];
 
+<<<<<<< Updated upstream
+=======
+  # Workaround for https://github.com/NixOS/nix/issues/8502
+  services.logrotate.checkConfig = false;
+
+  ${root_password_hash:+users.users.root.initialHashedPassword = ''$root_password_hash'';}
+
+>>>>>>> Stashed changes
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = ${zramswap};
   networking.hostName = "$(hostname -s)";
@@ -399,7 +407,9 @@ if [[ -z "$NO_SWAP" ]]; then
     makeSwap # smallest (512MB) droplet needs extra memory!
 fi
 makeConf
-infect
+if [[ -z "$NO_INFECT" ]]; then
+    infect
+fi
 if [[ -z "$NO_SWAP" ]]; then
     removeSwap
 fi