merging changes in upstream manually