Merge branch '35627-lint-for-conflict' into 'master'

Make sure we didn't commit conflicts

Closes #35627

See merge request !13141

scripts/lint-conflicts.sh

+#!/bin/sh
+
+output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
+echo $output
+test -z "$output"

scripts/static-analysis

@@ -11,7 +11,8 @@ tasks = [
   %w[bundle exec rake brakeman],
   %w[bundle exec license_finder],
   %w[yarn run eslint],
-  %w[bundle exec rubocop --require rubocop-rspec]
+  %w[bundle exec rubocop --require rubocop-rspec],
+  %w[scripts/lint-conflicts.sh]
 ]
 
 failed_tasks = tasks.reduce({}) do |failures, task|