Merging from main & fixed conflicts

Author: validbeck

site/faq/faq-privacy.qmd

@@ -24,11 +24,7 @@ ValidMind is a multi-tenant solution hosted on AWS. For organizations requiring
 
 ## How does ValidMind handle large datasets? What about the confidentiality of data sent to ValidMind?
 
-<<<<<<< HEAD
-ValidMind does not send datasets outside the client's environment. The {{< var developer >}} executes test suites and functions locally in your environment and is not limited by dataset size. Additionally, ValidMind adheres to a strict data confidentiality and retention policy, compliant with the SOC 2 security standard.
-=======
 ValidMind does not send datasets outside the client's environment. The {{< var vm.developer >}} executes test suites and functions locally in your environment and is not limited by dataset size.
->>>>>>> 1bd4b6bcac5f4736fd2a0cb9b9c64e096c61289e
 
 ::: {.callout}
 For more information, refer to our [data privacy policy](/about/fine-print/data-privacy-policy.qmd).