fixed merging issue, inserted ignore on DS_Store