Syncing with upstream Edge