Fixed issue with conflict logic