ZXTHL45OYLOICXTXXEQ6AMNSLMQFZ6BFUJWMO6LZOSDK7ERROC5AC
match diff.conflict_ends[diff.pos_a[i].conflict].conflict_type {
ConflictType::Zombie => {
solved_conflict_end = solved_conflict_end
.max(diff.conflict_ends[diff.pos_a[i].conflict].end_pos)
}
_ => {}
if let ConflictType::Zombie =
diff.conflict_ends[diff.pos_a[i].conflict].conflict_type
{
solved_conflict_end =
solved_conflict_end.max(diff.conflict_ends[diff.pos_a[i].conflict].end_pos)