Manually merge config files from iMac and MBP.