Only merge if both values are an object
Merge branch 'master' of github.com:jasny/config