Low-cost conflict resolution