manual merge of needed master branch files