Deleting Mac files
WIP
Merging