hawberries - conflict resolutionSo many conflicts can be...