Delivery optimizations
Conflict fix