diff --git a/_build_dependencies.sh b/_build_dependencies.sh
index 85591fda4e..35086be0a4 100644
--- a/_build_dependencies.sh
+++ b/_build_dependencies.sh
@@ -6,6 +6,12 @@ export NODE_VERSION=12
 # Byond Major
 export BYOND_MAJOR=514
 # Byond Minor
+<<<<<<< HEAD
 export BYOND_MINOR=1558
+||||||| parent of 09a2377063... Merge pull request #11731 from VOREStation/Arokha/civersion
+export BYOND_MINOR=1557
+=======
+export BYOND_MINOR=1569
+>>>>>>> 09a2377063... Merge pull request #11731 from VOREStation/Arokha/civersion
 # Macro Count
 export MACRO_COUNT=4