Mergin from upstream