defaults: merge headers
prefer late return statement
Merge pull request #946 from aj0strow/merge-default-headers

defaults: merge headers