Apple config stuff
Resolved merge conflicts