Merge with settings from another computer with small other fine-tunings