Added documentation on merging upstream changes