new plugin looking forward to conflict resolution