Conflict Resolution的动态