Update pre-commit configuration to enhance code quality checks

- Added `language_version` for black to specify Python 3.
- Included `args` for isort to use the black profile.
- Added new hooks for `trailing-whitespace` and `check-merge-conflict` to improve code cleanliness and prevent merge issues.

Author: TMHSDigital

.pre-commit-config.yaml

@@ -3,15 +3,19 @@ repos:
     rev: 24.3.0
     hooks:
       - id: black
+        language_version: python3
   - repo: https://github.com/PyCQA/isort
     rev: 5.13.2
     hooks:
       - id: isort
-  - repo: https://github.com/pycqa/flake8
+        args: ["--profile", "black"]
+  - repo: https://github.com/PyCQA/flake8
     rev: 7.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
     hooks:
-      - id: end-of-file-fixer 
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-merge-conflict