diff --git a/site/profiles/manifests/packages.pp b/site/profiles/manifests/packages.pp
index dc61d52..d2ef55c 100644
--- a/site/profiles/manifests/packages.pp
+++ b/site/profiles/manifests/packages.pp
@@ -5,6 +5,7 @@
 # - $exclude: An array of package names to be removed from managed hash
 #
 class profiles::packages (
+<<<<<<< HEAD
   Hash $include = {},
   Array[String] $exclude = [],
 ) {
@@ -16,4 +17,11 @@ class profiles::packages (
 
   # Manage packages
   ensure_packages($filtered_include)
+=======
+  Hash $manage = {},
+) {
+
+  # Manage packages
+  ensure_packages($manage)
+>>>>>>> d68d9e2 (feat: change packages to Hash)
 }