Merge original configs with OEM