Updated conflict logic