Syncing fork with upstream