hawberries-conflict resolution