upstream fetch and merge