manual merge with stashed content