delete .DS_Store
fixed conflict
.gitignore