ripeness for conflict resolution

Latest