drop the stash and commit again