diff --git a/.dockerignore b/.dockerignore
index 8dc8322..9050844 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,7 @@
 LICENSE
 dockerfile
 makefile
-.makeVars
+.vars
+.cursor
 *.md
 *.sh
diff --git a/.gitignore b/.gitignore
index d1b811b..26c5240 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
+.cursor
 *.sql
diff --git a/update_child_repos.sh b/update_child_repos.sh
index f2f79e4..844a7d7 100755
--- a/update_child_repos.sh
+++ b/update_child_repos.sh
@@ -38,7 +38,7 @@ if [ -z "${CLONE_URLS}" ]; then
   exit 0
 fi
 
-declare -a REPOS_WITH_CONFLICTS
+declare -a REPOS_WITH_CONFLICTS=()
 
 while IFS= read -r clone_url; do
   if [ -z "${clone_url}" ]; then
@@ -118,11 +118,13 @@ while IFS= read -r clone_url; do
     else
       echo "Warning: Merge conflicts detected in ${repo_name}"
       popd
+      rm -rf "${repo_name}"
       continue
     fi
   fi
 
   popd
+  rm -rf "${repo_name}"
 done <<< "${CLONE_URLS}"
 
 if [ ${#REPOS_WITH_CONFLICTS[@]} -gt 0 ]; then