git merge two repos with conflicting repos

git

--in original repo "a"
git remote add -f b "path/to/repo_b.git" [use github clone url for path]
git remote update
git diff master remotes/b/master
[resolve any merge conflicts - see related gist]
git merge -S --allow-unrelated-histories old-project/master
git remote rm b