Merge pull request #49 from pre-commit/only_check_merge_conflicted_files

Only check merge conflicts on conflict commits