Properly merge overrides.conf and defaultOverrides