Trying to fix issues .DS_Store files caused with merge