How well do various revision tools handle merge conflicts? | Heykuki News