ES 1.2.4
Conflict resolution