stash savepoint before merge from upstream