note to self conflict logic