merge stashed changes