Merged after stash