Fix merge with stash