Add .DS_Store to gitignore
Fix conflict