Removed DS_Store and shared data from merge