diff --git a/manifests/dpa.yaml b/manifests/dpa.yaml
index db70b84..402d3a9 100644
--- a/manifests/dpa.yaml
+++ b/manifests/dpa.yaml
@@ -44,7 +44,7 @@ spec:
         - aws
         - csi
         - kubevirt
-      defaultSnapshotMoveData: false
+      defaultSnapshotMoveData: true
       disableFsBackup: false
       podConfig:
         resourceAllocations:
diff --git a/manifests/stateful-backups.yaml b/manifests/stateful-backups.yaml
index 2d0426a..15afff1 100644
--- a/manifests/stateful-backups.yaml
+++ b/manifests/stateful-backups.yaml
@@ -60,6 +60,7 @@ spec:
                 timeout: 5m
                 onError: Continue
 
+<<<<<<< HEAD
         # Gitea PostgreSQL: checkpoint before backup
         #- name: gitea-postgres-checkpoint
         #  includedNamespaces:
@@ -78,6 +79,9 @@ spec:
         #        timeout: 2m
         #        onError: Continue
         # Authentik PostgreSQL: checkpoint before backup
+=======
+          # Authentik PostgreSQL: checkpoint before backup
+>>>>>>> 082f471 (Allow snapshits for NFS (hopefully))
         - name: authentik-postgres-checkpoint
           includedNamespaces:
             - authentik