Merged configuration from my laptop