removed DS Store
i hate you DS store
git ignore
git ignore
merge conflict