.DS_Store add
fix conflict