Fix: Remove useless configuration merging magic