main
config/merge: transcribe both parents of base of contested struct
*: update to v3_7_experimental spec