Updated instructions for merging with upstream