Retry conflicting merge with matching line endings?

I've been running into a lot of merge conflicts due to line endings
changing. For example, I branch from master when a file has CRLF line
endings (incorrectly) then somebody fixes a bug in that file (still
has CRLF line endings) on master then I realize the file should have
LF line endings so I change them. When I try to rebase on master
later, I get a merge conflict because it looks like every line has
changed and it conflicts with that other bug fix.

Would it be reasonable that if you get a conflict during a merge and
the line endings of the two commits are different then change the line
endings to match, retry the merge of that file, then apply the line
ending change commit?