Merging 2 repositories to preserve history using grafting