merging local copy into fork