merge with stash
fixed previous commit