Added conflictingFunction
Added conflictingFunction