snor
stash
merging done