Added pre-commit check-merge-conflict hook

Author: TekWizely

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.0.0
     hooks:
+    -   id: check-merge-conflict
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
-#   -   id: check-added-large-files