add os-specific settings
merge