Ignoring stupid apple files.
Merging...