Updated dotfiles directory path
Removed .DS_Store
Resolved conflict