Utilize pre-commit to block the commiting of conflicted files into repos.