Text this: Conflict diagnostic and resolution :