fix(sync): fold re-keyed upstream duplicates into their existing id (…

fix(sync): fold re-keyed upstream duplicates into their existing id (… #184