added instructions for merging upstream changes via github