Add conflictstyle diff3