added conflict logic