manual merge with upstream