merge from upstreams