Merged the settings with my Mac.