sqlFunction
Fixing conflicts