update change after merge conflict with stash