Fix: Merge configs with ancestors (Fixes #820)
Merge pull request #903 from jrajav/merge-configs-take2

Fix: Merge configs with ancestors (Fixes #820)