conflictstyle diff3