Fixed apple linking stuff
Fixed merge conflicts