Merging existing repo with 2nd edition work