merge the stash
fix