Add some notes for merging from origin(upstream)