merge the upstream changes