add plpythonu function fix
fix merge conflict