diff --git a/hosts/Lillie/hardware-configuration.nix b/hosts/Lillie/hardware-configuration.nix
index 571eac9..25c7a67 100644
--- a/hosts/Lillie/hardware-configuration.nix
+++ b/hosts/Lillie/hardware-configuration.nix
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.