Merge Mac Stuff