Updated instructions for merging from upstream