merging changes in upstream