rebase: fix things that I messed up during rebase

flake.nix

@@ -7,11 +7,7 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
-<<<<<<< HEAD
     nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a";
-=======
-    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/19493dc0ad16ffd5414ac9b4e12179d0e1b98468";
->>>>>>> d1ad881e (misc forgot to commit)
 
     home-manager = {
       url = "github:nix-community/home-manager/master";

modules/nixos/desktop/addons/hyprpaper/default.nix

@@ -1,15 +1,7 @@
 {
   config,
-<<<<<<< HEAD
   lib,
   namespace,
-=======
-  inputs,
-  lib,
-  namespace,
-  pkgs,
-  system,
->>>>>>> 8f3c53de (hyprland: setup hyprpanel, fix nvidia issues, accomodate new shadow config)
   ...
 }:
 let