apply/digest
fixed conflicts