Split overlay/diff into yakonfig.merge