Merge user options with defaults rather than override them