fetched and merged with upstream