hawberries - conflict resolution