Merging separate git repositories