Remove conflictstyle to diff3.