Rearrange, then merge common & local configs