diff --git a/modules/features/gitea.nix b/modules/features/gitea.nix
index ea0d27c..a64ac01 100644
--- a/modules/features/gitea.nix
+++ b/modules/features/gitea.nix
@@ -145,7 +145,6 @@
                 POSTGRES_DB=gitea
                 POSTGRES_PASSWORD=${config.sops.placeholder."gitea/dbpass"}
             '';
->>>>>>> dev
 
             virtualisation.oci-containers.containers."${name}" = {
                 image = "docker.gitea.com/gitea:1.25.4";