ignore the MACOSX, everything else is a merge