ignore mac desktop files
merge