fixed csv
fixed merge conflicts