merging back some repos to reflect final state.