fix: formatting and merge conflicts

home/colors.nix

@@ -1,5 +1,10 @@
 # home.nix
-{ pkgs, config, nix-colors, ... }:
+{
+  pkgs,
+  config,
+  nix-colors,
+  ...
+}:
 
 let
   nix-colors-lib = nix-colors.lib.contrib { inherit pkgs; };
@@ -142,8 +147,6 @@ let
     @define-color tooltip_bg_color #${c.base01};
     @define-color tooltip_fg_color #${c.base05};
   '';
-  };
-
 in
 {
   imports = [ nix-colors.homeManagerModules.default ];
@@ -255,7 +258,6 @@ in
     };
   };
 
-
   home.packages = with pkgs; [
     papirus-icon-theme
     gnome-themes-extra

modules/develPackages.nix

@@ -4,10 +4,6 @@
   lib,
   ...
 }:
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 {
   environment.systemPackages = with pkgs; [
     gdb
@@ -62,8 +58,5 @@
 
   ];
 
-<<<<<<< Updated upstream
-=======
   programs.dconf.enable = lib.mkDefault true;
->>>>>>> Stashed changes
 }