removed .DS_Store and ignored it
merge