Merge with the upstream