Merge pull request #116 from pre-commit/check_merge_conflict_binary_files Fix check-merge-conflict against binary files