Merge of local codebase with repo