Merge some config from my main machine