diff --git a/docs/merge-conflict-accept-all-current.rieks b/docs/merge-conflict-accept-all-current.rieks
new file mode 100644
index 0000000000000000000000000000000000000000..0f5bae38f6d73637197d5d592872456835248a65
--- /dev/null
+++ b/docs/merge-conflict-accept-all-current.rieks
@@ -0,0 +1,19 @@
+// Purpose: resolve all merge conflicts by accepting the CURRENT changes (change $1 to $2 to accept INCOMING changese)
+
+// This is a script that can be run by the Batch Replacer extension of VSCode .
+// Press Ctrl-Shift-P as you are editing this script, then search for `Batch Replacer`, and execute it.
+
+// If you do not specify the files to work on, the replace will be global (throughout the workspace).
+// `filter "document.txt"`           - document.txt file in the root folder
+// `filter "Documents/document.txt"` - document.txt file in the Documents folder in the root folder
+// `filter "**/document.txt"`        - document.txt files anywhere
+// `filter "*.txt"`                  - any .txt file in the root folder
+// `filter "**/*.txt"`               - any .txt file
+
+filter "docs/**/*.md"
+
+replace-regex "^<<<<<<<.*\n((?:.*\n)*)=======\n((?:.*\n)*)>>>>>>>.*\n"
+// To accept CURRENT changes
+with "$1"
+// To accept INCOMING changes
+// with "$2"
diff --git a/docs/terminology-maintenance-script.rieks b/docs/terminology-maintenance-script.rieks
index e576c8e919a754b427d40615b606b3a0623c7799..2b55fbe8bcc6ec33db7bed4618c649ffd205ac4e 100644
--- a/docs/terminology-maintenance-script.rieks
+++ b/docs/terminology-maintenance-script.rieks
@@ -10,7 +10,8 @@
 // Now, you have to manually execute /(?<=\|)([A-Z][^%]*)(?=%%)/\L$1/g/
 // 4. `|ref-text%% is being checked to see if modifications need to be made (e.g. plurals to singular etc.)
 // 5. There is a cleanup phase that removes any %%...|...%% syntax from the docusaurus header, markdown headers, and <img /> constructs.
-
+replace-regex "^<<<<<<<.*\n((?:.*\n)*)=======\n((?:.*\n)*)>>>>>>>.*\n"
+with "$1"
 // Complex regular expressions can be created using variables. Variables are applied to the entire script, and should be defined at the beginning of the script. Variables are defined as ... = "..." and are used as %{...}. Variables can only be used in the replace and replace-regex instructions.
 // variables can reference themselves and be overwritten - see documentation of 'batch replacer' extension