Initial merge of base repo content