fix remaining csv-provider problems
fix merge comments