merge in upstream chances