mergin in upstream changes