saving the changes
removed DS Store
fixed merge issue