Merging paths that diverged on GitHub