loaded stash
fixed conflicts