Removed DS_Store and started removing shared data from merge