Added conflict functinons