diff --git a/sonar-project.properties b/sonar-project.properties
index 91a1d8b3..fe09fd31 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -17,7 +17,7 @@ sonar.test.inclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**
 sonar.cpd.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**
 
 # Ignored rules
-sonar.issue.ignore.multicriteria=reactPropsJs,reactPropsJsx,preferGlobalThisJs,preferGlobalThisJsx,preferAtJs,preferAtJsx,replaceAllJs,replaceAllJsx,stringReplaceAllJs,stringReplaceAllJsx,pascalCaseFunctions
+sonar.issue.ignore.multicriteria=reactPropsJs,reactPropsJsx,preferGlobalThisJs,preferGlobalThisJsx,preferAtJs,preferAtJsx,replaceAllJs,replaceAllJsx,stringReplaceAllJs,stringReplaceAllJsx,pascalCaseFunctionsJs,pascalCaseFunctionsJsx,pascalCaseFunctionsTs,pascalCaseFunctionsTsx
 
 # S6774: React props validation - using TypeScript/JSDoc for prop types instead
 sonar.issue.ignore.multicriteria.reactPropsJs.ruleKey=javascript:S6774
@@ -37,11 +37,7 @@ sonar.issue.ignore.multicriteria.preferAtJs.resourceKey=**/*.js
 sonar.issue.ignore.multicriteria.preferAtJsx.ruleKey=javascript:S7755
 sonar.issue.ignore.multicriteria.preferAtJsx.resourceKey=**/*.jsx
 
-<<<<<<< HEAD
-# S6316: Array.prototype.replaceAll
-=======
 # S6316: Array.prototype.replaceAll may not be supported in all browsers
->>>>>>> main
 sonar.issue.ignore.multicriteria.replaceAllJs.ruleKey=javascript:S6316
 sonar.issue.ignore.multicriteria.replaceAllJs.resourceKey=**/*.js
 sonar.issue.ignore.multicriteria.replaceAllJsx.ruleKey=javascript:S6316
@@ -54,5 +50,11 @@ sonar.issue.ignore.multicriteria.stringReplaceAllJsx.ruleKey=javascript:S7781
 sonar.issue.ignore.multicriteria.stringReplaceAllJsx.resourceKey=**/*.jsx
 
 # S100: Function names should comply with a naming convention (PascalCase for React/Inits) - mustn't pics up React functions
-sonar.issue.ignore.multicriteria.pascalCaseFunctions.ruleKey=javascript:S100
-sonar.issue.ignore.multicriteria.pascalCaseFunctions.resourceKey=**/*.js,**/*.jsx,**/*.ts,**/*.tsx
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsJs.ruleKey=javascript:S100
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsJs.resourceKey=**/*.js
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsJsx.ruleKey=javascript:S100
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsJsx.resourceKey=**/*.jsx
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsTs.ruleKey=javascript:S100
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsTs.resourceKey=**/*.ts
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsTsx.ruleKey=javascript:S100
+sonar.issue.ignore.multicriteria.pascalCaseFunctionsTsx.resourceKey=**/*.tsx