changed columns from 4 to 3
changed columns to 3 from 4
deleted .DS_Store
resolve conflict