hawberries- conflict resolution