diff --git a/sdata/subcmd-exp-merge/0.run.sh b/sdata/subcmd-exp-merge/0.run.sh
index 4afff5ad4..097893ac1 100644
--- a/sdata/subcmd-exp-merge/0.run.sh
+++ b/sdata/subcmd-exp-merge/0.run.sh
@@ -288,6 +288,19 @@ update_hypr_config() {
 
 log_header "Experimental Config Merge"
 
+if [[ "$SKIP_NOTICE" == false ]]; then
+  log_warning "THIS SCRIPT IS EXPERIMENTAL, ONLY CONTINUE AT YOUR OWN RISK!"
+  log_warning "It might be safer if you want to preserve your modifications and not delete added files,"
+  log_warning "  but this can cause partial updates and therefore unexpected behavior."
+  log_warning "In general, prefer \"./setup install\" for updates if available."
+  safe_read "Continue? (y/N): " response "N"
+
+  if [[ ! "$response" =~ ^[Yy]$ ]]; then
+    log_error "Merge aborted by user"
+    exit 1
+  fi
+fi
+
 check_preconditions
 
 fetch_upstream
diff --git a/setup b/setup
index ee2fba78f..9715ea721 100755
--- a/setup
+++ b/setup
@@ -49,7 +49,7 @@ case $1 in
   # Global help
   ""|help|--help|-h)showhelp_global;exit;;
   # Correct subcommand
-  install|exp-uninstall|exp-update|exp-update-old|exp-merge|resetfirstrun|checkdeps|virtmon)
+  install|uninstall|exp-update|exp-update-old|exp-merge|resetfirstrun|checkdeps|virtmon)
     SUBCMD_NAME=$1
     SUBCMD_DIR=./sdata/subcmd-$1
     shift;;