diff --git a/flake.nix b/flake.nix
index a93799e..3819a82 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,10 +9,7 @@
     #chaotic.url = "github:lonerOrz/nyx-loner";
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel";
     aagl.url = "github:ezKEa/aagl-gtk-on-nix";
-<<<<<<< HEAD
-=======
     disko.url = "github:nix-community/disko";
->>>>>>> d196fd5 (Adicionado a configuraçao da VPS)
     home-manager = {
       url = "github:nix-community/home-manager/";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -54,10 +51,7 @@
       aagl,
       noctalia,
       niri,
-<<<<<<< HEAD
-=======
       disko,
->>>>>>> d196fd5 (Adicionado a configuraçao da VPS)
       ...
     }@inputs:
     {
@@ -89,11 +83,7 @@
         system = "aarch64-linux";
         specialArgs = { inherit inputs; };
         modules = [
-<<<<<<< HEAD
-          #./configuration.nix
-=======
           ./hosts/darkgui-vps/configuration.nix
->>>>>>> d196fd5 (Adicionado a configuraçao da VPS)
         ];
       };