conflict resolution

Subscribe to conflict resolution