diff --git a/haxe_libraries/kiss-tools.hxml b/haxe_libraries/kiss-tools.hxml
index af76b69..1d1012f 100644
--- a/haxe_libraries/kiss-tools.hxml
+++ b/haxe_libraries/kiss-tools.hxml
@@ -1,10 +1,4 @@
-<<<<<<< Updated upstream
-# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#b697601fec2a8838532f9873c95bef514cdf9a15" into kiss-tools/0.0.0/github/b697601fec2a8838532f9873c95bef514cdf9a15
+# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#b70a6c16f025f5b2d02a37514fb97c2cded592c8" into kiss-tools/0.0.0/github/b70a6c16f025f5b2d02a37514fb97c2cded592c8
 -lib kiss
--cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/b697601fec2a8838532f9873c95bef514cdf9a15/src/
-=======
-# @install: lix --silent download "gh://github.com/kiss-lang/kiss-tools#6365011e1c47bfb199708868cdc30308021cd3b0" into kiss-tools/0.0.0/github/6365011e1c47bfb199708868cdc30308021cd3b0
--lib kiss
--cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/6365011e1c47bfb199708868cdc30308021cd3b0/src/
->>>>>>> Stashed changes
+-cp ${HAXE_LIBCACHE}/kiss-tools/0.0.0/github/b70a6c16f025f5b2d02a37514fb97c2cded592c8/src/
 -D kiss-tools=0.0.0
\ No newline at end of file
diff --git a/haxe_libraries/kiss.hxml b/haxe_libraries/kiss.hxml
index 8550822..fdfc4ef 100644
--- a/haxe_libraries/kiss.hxml
+++ b/haxe_libraries/kiss.hxml
@@ -1,21 +1,12 @@
-<<<<<<< Updated upstream
-# @install: lix --silent download "gh://github.com/kiss-lang/kiss#e91ca8d6ecfecc0e6aeba37da6f1ccd6da621ccc" into kiss/0.0.1/github/e91ca8d6ecfecc0e6aeba37da6f1ccd6da621ccc
-# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/e91ca8d6ecfecc0e6aeba37da6f1ccd6da621ccc"
-=======
-# @install: lix --silent download "gh://github.com/kiss-lang/kiss#636f332bc5f2579dc3a10f16381e14531d149108" into kiss/0.0.1/github/636f332bc5f2579dc3a10f16381e14531d149108
-# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/636f332bc5f2579dc3a10f16381e14531d149108"
->>>>>>> Stashed changes
+# @install: lix --silent download "gh://github.com/kiss-lang/kiss#4478327fa8515c256bda1b90216238e2644fab91" into kiss/0.0.1/github/4478327fa8515c256bda1b90216238e2644fab91
+# @run: haxelib run-dir kiss "${HAXE_LIBCACHE}/kiss/0.0.1/github/4478327fa8515c256bda1b90216238e2644fab91"
 -lib haxe-strings
 -lib hscript
 -lib tink_json
 -lib tink_macro
 -lib tink_syntaxhub
 -lib uuid
-<<<<<<< Updated upstream
--cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/e91ca8d6ecfecc0e6aeba37da6f1ccd6da621ccc/src
-=======
--cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/636f332bc5f2579dc3a10f16381e14531d149108/src
->>>>>>> Stashed changes
+-cp ${HAXE_LIBCACHE}/kiss/0.0.1/github/4478327fa8515c256bda1b90216238e2644fab91/src
 -D kiss=0.0.1
 -w -WUnusedPattern
 --macro kiss.KissFrontend.use()
\ No newline at end of file