Merge stashed changes