Text this: Changes and conflicts