Fixed merge conflict with stash