take over latest upstream changes