diff --git a/argentum/store/halyde/package.cfg b/argentum/store/halyde/package.cfg
index cde2b9a..8bc6241 100644
--- a/argentum/store/halyde/package.cfg
+++ b/argentum/store/halyde/package.cfg
@@ -36,7 +36,11 @@ Ahalyde/lib/component.lua
 Ahalyde/lib/event.lua
 Ahalyde/lib/filesystem.lua
 Ahalyde/lib/raster.lua"
+<<<<<<< HEAD
 V1.2.0
+=======
+V1.1.0
+>>>>>>> 9a8648835a1ec5569f7d33744d5eec1d9db9dd0b
 Ahalyde/
 Ahalyde/apps/
 Ahalyde/apps/helpdb/