Remove merge conflicts from Substitution_O family