Add config merger, don't panic on nil config