disable all autocorrect in work machine
p4 editor
fix merge