resolved merge conflicts

cleaned up for loop

ignored .DS_Store
removed duplicate code