Update git conflict finding.