Fixed merge conflict with stash
Fixed merge issues