stash me
fixed merge issues