Ignore DS_STORE
Fix merge conflict