Fixed bug where unstashing with conflicts caused endless loop in terminal.