Avoid searching for Conflicts where they aren't.

According to git, anyway.