begin merging source upstream