Text this: Working with conflict 2 :