diff --git a/roles/debian-base/defaults/main.yaml b/roles/debian-base/defaults/main.yaml
index 96440cb..d2375bf 100644
--- a/roles/debian-base/defaults/main.yaml
+++ b/roles/debian-base/defaults/main.yaml
@@ -27,11 +27,10 @@ base_packages:
   - ncdu
   - debconf-utils
   - net-tools
-<<<<<<< HEAD
+  - gpg
+  - curl
   - cloud-guest-utils
-=======
   - rsync
->>>>>>> main
 locales_present:
   - en_US.UTF-8
   - es_ES.UTF-8