Text this: Making conflict work