Add conflict resolution for target action