diff --git a/.gitignore b/.gitignore
index 004d99cec0744d6c7b97a4f2db19d7673ab0f3c6..aae82f1d705e91c4a1a65ba4e75783324fd4025f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,9 +124,8 @@ virt_env*/
 # Ignore (Batch) runscripts
 video_prediction_tools/HPC_scripts/**
 !video_prediction_tools/HPC_scripts/*_template.sh
-video_prediction_tools/Zam347_scripts/**
-!video_prediction_tools/Zam347_scripts/*_template.sh
-<<<<<<< HEAD
+video_prediction_tools/nonHPC_scripts/**
+!video_prediction_tools/nonHPC_scripts/*_template.sh
 
 # Ignore datasplit config files
 video_prediction_tools/data_split/**